From owner-p4-projects@FreeBSD.ORG Sun Apr 20 14:13:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 017161065673; Sun, 20 Apr 2008 14:13:16 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B8375106566C
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 14:13:15 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id A67708FC0C
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 14:13:15 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KEDFfs039081
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 14:13:15 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KEDFf0039079
for perforce@freebsd.org; Sun, 20 Apr 2008 14:13:15 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 14:13:15 GMT
Message-Id: <200804201413.m3KEDFf0039079@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140294 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 14:13:17 -0000
http://perforce.freebsd.org/chv.cgi?CH=140294
Change 140294 by hselasky@hselasky_laptop001 on 2008/04/20 14:13:09
Reduce size of static memory array so that the
kernel will load on AT91RM9200. I looks like an
array of 8MB is too much even though there is
enough memory on the hardware.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/ustorage_fs.c#3 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/ustorage_fs.c#3 (text+ko) ====
@@ -62,7 +62,7 @@
#define USTORAGE_FS_BULK_SIZE (1 << 17)
#define USTORAGE_FS_MAX_LUN 8
#define USTORAGE_FS_RELEASE 0x0101
-#define USTORAGE_FS_RAM_SECT (1 << 14)
+#define USTORAGE_FS_RAM_SECT (1 << 13)
static uint8_t ustorage_fs_ramdisk[USTORAGE_FS_RAM_SECT << 9];
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 14:19:23 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 51C3C1065675; Sun, 20 Apr 2008 14:19:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CFBBA106566C
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 14:19:22 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id BDF9C8FC1A
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 14:19:22 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KEJMRT039245
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 14:19:22 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KEJMCl039243
for perforce@freebsd.org; Sun, 20 Apr 2008 14:19:22 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 14:19:22 GMT
Message-Id: <200804201419.m3KEJMCl039243@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140295 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 14:19:23 -0000
http://perforce.freebsd.org/chv.cgi?CH=140295
Change 140295 by hselasky@hselasky_laptop001 on 2008/04/20 14:18:21
Fix compiler warning.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/ucom.c#30 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/ucom.c#30 (text+ko) ====
@@ -205,8 +205,6 @@
ucom_bitmap[x / 8] |= (1 << (x % 8));
}
- *p_root_unit = n;
-
error = 0;
break;
@@ -216,6 +214,12 @@
mtx_unlock(&Giant);
+ /*
+ * Always set the variable pointed to by "p_root_unit" so that
+ * the compiler does not think that it is used uninitialised:
+ */
+ *p_root_unit = n;
+
return (error);
}
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 15:02:07 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id ED11A1065671; Sun, 20 Apr 2008 15:02:06 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id AF70E106564A
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:02:06 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 851E78FC0C
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:02:06 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KF265U040549
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:02:06 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KF26nQ040547
for perforce@freebsd.org; Sun, 20 Apr 2008 15:02:06 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 15:02:06 GMT
Message-Id: <200804201502.m3KF26nQ040547@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140296 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 15:02:07 -0000
http://perforce.freebsd.org/chv.cgi?CH=140296
Change 140296 by hselasky@hselasky_laptop001 on 2008/04/20 15:01:31
Need to lock "sc->sc_mtx" before calling "usbd_transfer_start()".
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#43 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#43 (text+ko) ====
@@ -636,7 +636,9 @@
}
/* start reading of status */
+ mtx_lock(&(sc->sc_mtx));
usbd_transfer_start(sc->sc_xfer[2]);
+ mtx_unlock(&(sc->sc_mtx));
return (0);
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 15:17:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id D34C4106566C; Sun, 20 Apr 2008 15:17:22 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 95DFA106564A
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:17:22 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 854098FC0C
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:17:22 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KFHMEI042214
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:17:22 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KFHMak042212
for perforce@freebsd.org; Sun, 20 Apr 2008 15:17:22 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 15:17:22 GMT
Message-Id: <200804201517.m3KFHMak042212@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140297 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 15:17:23 -0000
http://perforce.freebsd.org/chv.cgi?CH=140297
Change 140297 by hselasky@hselasky_laptop001 on 2008/04/20 15:16:57
There is some USB code that depends on Giant
being locked when "attach" is called, which
should not depend on that.
Fix this.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/ukbd.c#43 edit
.. //depot/projects/usb/src/sys/dev/usb/uvscom.c#39 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/ukbd.c#43 (text+ko) ====
@@ -704,15 +704,17 @@
if (bootverbose) {
genkbd_diag(kbd, bootverbose);
}
+ /* lock keyboard mutex */
+
+ mtx_lock(&Giant);
+
/* start the keyboard */
usbd_transfer_start(sc->sc_xfer[0]);
/* start the timer */
- mtx_lock(&Giant);
-
- ukbd_timeout(sc);
+ ukbd_timeout(sc); /* will unlock mutex */
return (0); /* success */
==== //depot/projects/usb/src/sys/dev/usb/uvscom.c#39 (text+ko) ====
@@ -365,8 +365,9 @@
goto detach;
}
/* start interrupt pipe */
-
+ mtx_lock(sc->sc_xfer[4]->priv_mtx);
usbd_transfer_start(sc->sc_xfer[4]);
+ mtx_unlock(sc->sc_xfer[4]->priv_mtx);
return (0);
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 15:21:26 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id D68E11065672; Sun, 20 Apr 2008 15:21:26 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 98DA5106566B
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:21:26 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 879848FC13
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:21:26 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KFLQpD046029
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:21:26 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KFLQ9p046027
for perforce@freebsd.org; Sun, 20 Apr 2008 15:21:26 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 15:21:26 GMT
Message-Id: <200804201521.m3KFLQ9p046027@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140298 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 15:21:27 -0000
http://perforce.freebsd.org/chv.cgi?CH=140298
Change 140298 by hselasky@hselasky_laptop001 on 2008/04/20 15:20:31
Style: Function prototypes should be on a single line.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/umass.c#47 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/umass.c#47 (text+ko) ====
@@ -979,94 +979,36 @@
static usbd_callback_t umass_t_cbi_status_callback;
static void umass_cancel_ccb(struct umass_softc *sc);
+static void umass_init_shuttle(struct umass_softc *sc);
+static void umass_reset(struct umass_softc *sc);
+static void umass_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer);
+static void umass_command_start(struct umass_softc *sc, uint8_t dir, void *data_ptr, uint32_t data_len, uint32_t data_timeout, umass_callback_t *callback, union ccb *ccb);
+static uint8_t umass_bbb_get_max_lun(struct umass_softc *sc);
+static void umass_cbi_start_status(struct umass_softc *sc);
+static void umass_t_cbi_data_clear_stall_callback(struct usbd_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer);
+static int umass_cam_attach_sim(struct umass_softc *sc);
+static void umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb);
+static void umass_cam_rescan(struct umass_softc *sc);
+static void umass_cam_attach(struct umass_softc *sc);
+static void umass_cam_detach_sim(struct umass_softc *sc);
+static void umass_cam_action(struct cam_sim *sim, union ccb *ccb);
+static void umass_cam_poll(struct cam_sim *sim);
+static void umass_cam_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, uint8_t status);
+static void umass_cam_sense_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, uint8_t status);
+static void umass_cam_quirk_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue, uint8_t status);
+static uint8_t umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len);
+static uint8_t umass_rbc_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len);
-static void
- umass_init_shuttle(struct umass_softc *sc);
-
-static void
- umass_reset(struct umass_softc *sc);
-
-static void
-umass_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer,
- uint8_t next_xfer,
- uint8_t stall_xfer);
-static void
-umass_command_start(struct umass_softc *sc, uint8_t dir,
- void *data_ptr, uint32_t data_len,
- uint32_t data_timeout, umass_callback_t *callback,
- union ccb *ccb);
-static uint8_t
- umass_bbb_get_max_lun(struct umass_softc *sc);
-
-static void
- umass_cbi_start_status(struct umass_softc *sc);
-
-static void
-umass_t_cbi_data_clear_stall_callback(struct usbd_xfer *xfer,
- uint8_t next_xfer,
- uint8_t stall_xfer);
-static int
- umass_cam_attach_sim(struct umass_softc *sc);
-
-static void
- umass_cam_rescan_callback(struct cam_periph *periph, union ccb *ccb);
-
-static void
- umass_cam_rescan(struct umass_softc *sc);
+static uint8_t umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len);
+static uint8_t umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len);
+static uint8_t umass_no_transform(struct umass_softc *sc, uint8_t *cmd, uint8_t cmdlen);
+static uint8_t umass_std_transform(struct umass_softc *sc, union ccb *ccb, uint8_t *cmd, uint8_t cmdlen);
-static void
- umass_cam_attach(struct umass_softc *sc);
-
-static void
- umass_cam_detach_sim(struct umass_softc *sc);
-
-static void
- umass_cam_action(struct cam_sim *sim, union ccb *ccb);
-
-static void
- umass_cam_poll(struct cam_sim *sim);
-
-static void
-umass_cam_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue,
- uint8_t status);
-static void
-umass_cam_sense_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue,
- uint8_t status);
-static void
-umass_cam_quirk_cb(struct umass_softc *sc, union ccb *ccb, uint32_t residue,
- uint8_t status);
-static uint8_t
-umass_scsi_transform(struct umass_softc *sc, uint8_t *cmd_ptr,
- uint8_t cmd_len);
-static uint8_t
- umass_rbc_transform(struct umass_softc *sc, uint8_t *cmd_ptr, uint8_t cmd_len);
-
-static uint8_t
-umass_ufi_transform(struct umass_softc *sc, uint8_t *cmd_ptr,
- uint8_t cmd_len);
-static uint8_t
-umass_atapi_transform(struct umass_softc *sc, uint8_t *cmd_ptr,
- uint8_t cmd_len);
-static uint8_t
-umass_no_transform(struct umass_softc *sc, uint8_t *cmd,
- uint8_t cmdlen);
-static uint8_t
-umass_std_transform(struct umass_softc *sc, union ccb *ccb,
- uint8_t *cmd, uint8_t cmdlen);
-
#ifdef USB_DEBUG
-static void
- umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw);
-
-static void
- umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw);
-
-static void
- umass_cbi_dump_cmd(struct umass_softc *sc, void *cmd, uint8_t cmdlen);
-
-static void
-umass_dump_buffer(struct umass_softc *sc, uint8_t *buffer, uint32_t buflen,
- uint32_t printlen);
+static void umass_bbb_dump_cbw(struct umass_softc *sc, umass_bbb_cbw_t *cbw);
+static void umass_bbb_dump_csw(struct umass_softc *sc, umass_bbb_csw_t *csw);
+static void umass_cbi_dump_cmd(struct umass_softc *sc, void *cmd, uint8_t cmdlen);
+static void umass_dump_buffer(struct umass_softc *sc, uint8_t *buffer, uint32_t buflen, uint32_t printlen);
#endif
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 15:22:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0B6401065675; Sun, 20 Apr 2008 15:22:28 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C164E106564A
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:22:27 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id B0B568FC17
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:22:27 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KFMRQn046074
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 15:22:27 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KFMR4t046072
for perforce@freebsd.org; Sun, 20 Apr 2008 15:22:27 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 15:22:27 GMT
Message-Id: <200804201522.m3KFMR4t046072@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140299 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 15:22:28 -0000
http://perforce.freebsd.org/chv.cgi?CH=140299
Change 140299 by hselasky@hselasky_laptop001 on 2008/04/20 15:22:03
Style: Prototypes should be on a single line.
Affected files ...
.. //depot/projects/usb/src/sys/dev/ata/ata-usb.c#36 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/ata/ata-usb.c#36 (text) ====
@@ -140,19 +140,10 @@
static usbd_callback_t atausb_tr_error;
static void atausb_cancel_request(struct atausb_softc *sc);
-
-static void
- atausb_transfer_start(struct atausb_softc *sc, uint8_t xfer_no);
-
-static void
-atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer,
- uint8_t next_xfer,
- uint8_t stall_xfer);
-static int
- ata_usbchannel_begin_transaction(struct ata_request *request);
-
-static int
- ata_usbchannel_end_transaction(struct ata_request *request);
+static void atausb_transfer_start(struct atausb_softc *sc, uint8_t xfer_no);
+static void atausb_t_bbb_data_clear_stall_callback(struct usbd_xfer *xfer, uint8_t next_xfer, uint8_t stall_xfer);
+static int ata_usbchannel_begin_transaction(struct ata_request *request);
+static int ata_usbchannel_end_transaction(struct ata_request *request);
static device_probe_t ata_usbchannel_probe;
static device_attach_t ata_usbchannel_attach;
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 16:05:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 28CA81065675; Sun, 20 Apr 2008 16:05:16 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id DEDF71065672
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 16:05:15 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id CF1EA8FC1C
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 16:05:15 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KG5FdV048711
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 16:05:15 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KG5F5C048709
for perforce@freebsd.org; Sun, 20 Apr 2008 16:05:15 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 16:05:15 GMT
Message-Id: <200804201605.m3KG5F5C048709@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140302 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 16:05:16 -0000
http://perforce.freebsd.org/chv.cgi?CH=140302
Change 140302 by hselasky@hselasky_laptop001 on 2008/04/20 16:04:45
Spelling fix.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#124 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/usb_transfer.c#124 (text+ko) ====
@@ -1343,7 +1343,7 @@
/*------------------------------------------------------------------------*
* usbd_std_root_transfer - factored out code
*
- * This function is basically used for the Virtual Root HUB, end can
+ * This function is basically used for the Virtual Root HUB, and can
* emulate control, bulk and interrupt endpoints. Data is exchanged
* using the "std->ptr" and "std->len" fields, that allows kernel
* virtual memory to be transferred. All state is kept in the
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 16:39:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CB7111065672; Sun, 20 Apr 2008 16:39:54 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 8C8C6106566B
for <perforce@freebsd.org>; Sun, 20 Apr 2008 16:39:54 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 7BEC18FC0A
for <perforce@freebsd.org>; Sun, 20 Apr 2008 16:39:54 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KGdsvi050063
for <perforce@freebsd.org>; Sun, 20 Apr 2008 16:39:54 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KGds7v050061
for perforce@freebsd.org; Sun, 20 Apr 2008 16:39:54 GMT
(envelope-from sam@freebsd.org)
Date: Sun, 20 Apr 2008 16:39:54 GMT
Message-Id: <200804201639.m3KGds7v050061@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140306 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 16:39:55 -0000
http://perforce.freebsd.org/chv.cgi?CH=140306
Change 140306 by sam@sam_ebb on 2008/04/20 16:39:09
IFC @ 140305
Affected files ...
.. //depot/projects/vap/lib/libc/stdlib/strfmon.c#4 integrate
.. //depot/projects/vap/sys/amd64/amd64/machdep.c#9 integrate
.. //depot/projects/vap/sys/conf/files#32 integrate
.. //depot/projects/vap/sys/conf/files.pc98#8 integrate
.. //depot/projects/vap/sys/contrib/pf/net/pf.c#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_l2t.c#5 delete
.. //depot/projects/vap/sys/dev/cxgb/cxgb_l2t.h#5 delete
.. //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#8 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.c#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/cxgb_offload.h#5 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#7 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate
.. //depot/projects/vap/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate
.. //depot/projects/vap/sys/dev/iscsi/initiator/iscsi.c#3 integrate
.. //depot/projects/vap/sys/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/vap/sys/ia64/ia64/mp_machdep.c#7 integrate
.. //depot/projects/vap/sys/ia64/ia64/pmap.c#9 integrate
.. //depot/projects/vap/sys/modules/cxgb/cxgb/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/cxgb/tom/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/firmware/Makefile#3 integrate
.. //depot/projects/vap/sys/net/if.c#11 integrate
.. //depot/projects/vap/sys/net/if_media.h#9 integrate
.. //depot/projects/vap/sys/netgraph/ng_base.c#18 integrate
.. //depot/projects/vap/sys/netinet/in_pcb.c#13 integrate
.. //depot/projects/vap/sys/netinet/ip_fw2.c#12 integrate
.. //depot/projects/vap/sys/netinet/ip_output.c#10 integrate
.. //depot/projects/vap/sys/netinet/tcp_offload.h#2 integrate
.. //depot/projects/vap/sys/netinet/tcp_syncache.c#8 integrate
.. //depot/projects/vap/sys/netinet6/in6_pcb.c#8 integrate
.. //depot/projects/vap/sys/pc98/cbus/clock.c#5 integrate
.. //depot/projects/vap/sys/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/vap/sys/pc98/include/clock.h#4 integrate
.. //depot/projects/vap/sys/security/audit/audit_arg.c#7 integrate
.. //depot/projects/vap/sys/security/mac/mac_inet.c#6 integrate
.. //depot/projects/vap/usr.bin/procstat/procstat.1#2 integrate
Differences ...
==== //depot/projects/vap/lib/libc/stdlib/strfmon.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.18 2008/04/19 07:22:58 ru Exp $");
#include <sys/types.h>
#include <ctype.h>
@@ -67,6 +67,8 @@
while (isdigit((unsigned char)*fmt)) { \
VAR *= 10; \
VAR += *fmt - '0'; \
+ if (VAR < 0) \
+ goto e2big_error; \
fmt++; \
} \
} while (0)
@@ -187,7 +189,7 @@
/* Do we have enough space to put number with
* required width ?
*/
- if (dst + width >= s + maxsize)
+ if ((unsigned int)width >= maxsize - (dst - s))
goto e2big_error;
}
@@ -196,6 +198,8 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(left_prec);
+ if ((unsigned int)left_prec >= maxsize - (dst - s))
+ goto e2big_error;
}
/* Right precision */
@@ -203,6 +207,9 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(right_prec);
+ if ((unsigned int)right_prec >= maxsize - (dst - s) -
+ left_prec)
+ goto e2big_error;
}
/* Conversion Characters */
@@ -218,6 +225,8 @@
goto format_error;
}
+ if (currency_symbol != NULL)
+ free(currency_symbol);
if (flags & USE_INTL_CURRENCY) {
currency_symbol = strdup(lc->int_curr_symbol);
if (currency_symbol != NULL)
@@ -246,6 +255,8 @@
pad_size = 0;
}
+ if (asciivalue != NULL)
+ free(asciivalue);
asciivalue = __format_grouped_double(value, &flags,
left_prec, right_prec, pad_char);
if (asciivalue == NULL)
==== //depot/projects/vap/sys/amd64/amd64/machdep.c#9 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.683 2008/03/16 10:58:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.684 2008/04/19 07:25:57 peter Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -847,11 +847,23 @@
#if !defined(DEV_ATPIC) && defined(DEV_ISA)
#include <isa/isavar.h>
-u_int
+#include <isa/isareg.h>
+/*
+ * Return a bitmap of the current interrupt requests. This is 8259-specific
+ * and is only suitable for use at probe time.
+ * This is only here to pacify sio. It is NOT FATAL if this doesn't work.
+ * It shouldn't be here. There should probably be an APIC centric
+ * implementation in the apic driver code, if at all.
+ */
+intrmask_t
isa_irq_pending(void)
{
+ u_char irr1;
+ u_char irr2;
- return (0);
+ irr1 = inb(IO_ICU1);
+ irr2 = inb(IO_ICU2);
+ return ((irr2 << 8) | irr1);
}
#endif
==== //depot/projects/vap/sys/conf/files#32 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1290 2008/04/16 17:24:18 rrs Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1291 2008/04/19 03:22:41 kmacy Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -520,7 +520,6 @@
dev/cs/if_cs_pccard.c optional cs pccard
dev/cxgb/cxgb_main.c optional cxgb pci
dev/cxgb/cxgb_offload.c optional cxgb pci
-dev/cxgb/cxgb_l2t.c optional cxgb pci
dev/cxgb/cxgb_lro.c optional cxgb pci
dev/cxgb/cxgb_sge.c optional cxgb pci
dev/cxgb/cxgb_multiq.c optional cxgb pci
==== //depot/projects/vap/sys/conf/files.pc98#8 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.360 2008/04/13 06:18:34 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.361 2008/04/19 08:18:47 nyan Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -336,6 +336,7 @@
pc98/cbus/nmi.c standard
pc98/cbus/olpt.c optional olpt
pc98/cbus/pckbd.c optional pckbd
+pc98/cbus/pcrtc.c standard
pc98/cbus/pmc.c optional pmc
pc98/cbus/scgdcrndr.c optional sc gdc
pc98/cbus/scterm-sck.c optional sc
==== //depot/projects/vap/sys/contrib/pf/net/pf.c#7 (text+ko) ====
@@ -40,7 +40,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.52 2008/04/17 21:38:15 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.53 2008/04/20 00:21:54 rwatson Exp $");
#endif
#ifdef __FreeBSD__
@@ -2915,7 +2915,7 @@
pd->lookup.pid = NO_PID; /* XXX: revisit */
#ifdef __FreeBSD__
if (inp_arg != NULL) {
- INP_WLOCK_ASSERT(inp_arg);
+ INP_LOCK_ASSERT(inp_arg);
if (inp_arg->inp_socket) {
pd->lookup.uid = inp_arg->inp_socket->so_cred->cr_uid;
pd->lookup.gid =
@@ -3018,16 +3018,15 @@
return (-1);
}
#ifdef __FreeBSD__
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
+ INP_INFO_RUNLOCK(pi);
if ((inp->inp_socket == NULL) || (inp->inp_socket->so_cred == NULL)) {
- INP_WUNLOCK(inp);
- INP_INFO_RUNLOCK(pi);
+ INP_RUNLOCK(inp);
return (-1);
}
pd->lookup.uid = inp->inp_socket->so_cred->cr_uid;
pd->lookup.gid = inp->inp_socket->so_cred->cr_groups[0];
- INP_WUNLOCK(inp);
- INP_INFO_RUNLOCK(pi);
+ INP_RUNLOCK(inp);
#else
pd->lookup.uid = inp->inp_socket->so_euid;
pd->lookup.gid = inp->inp_socket->so_egid;
==== //depot/projects/vap/sys/dev/cxgb/cxgb_main.c#8 (text+ko) ====
@@ -1,6 +1,6 @@
/**************************************************************************
-Copyright (c) 2007, Chelsio Inc.
+Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-2. Neither the name of the Chelsio Corporation nor the names of its
+ 2. Neither the name of the Chelsio Corporation nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.53 2008/03/20 20:52:37 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.54 2008/04/19 03:22:41 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -723,9 +723,10 @@
printf("cxgb_free: DEVMAP_BIT not set\n");
} else
printf("not offloading set\n");
-
+#ifdef notyet
if (sc->flags & CXGB_OFLD_INIT)
cxgb_offload_deactivate(sc);
+#endif
free(sc->filters, M_DEVBUF);
t3_sge_free(sc);
@@ -1732,9 +1733,6 @@
t3_tp_set_offload_mode(adapter, 1);
tdev->lldev = pi->ifp;
- err = cxgb_offload_activate(adapter);
- if (err)
- goto out;
init_port_mtus(adapter);
t3_load_mtus(adapter, adapter->params.mtus, adapter->params.a_wnd,
@@ -1743,10 +1741,6 @@
adapter->port[0].ifp->if_mtu : 0xffff);
init_smt(adapter);
- /* Call back all registered clients */
- cxgb_add_clients(tdev);
-
-out:
/* restore them in case the offload module has changed them */
if (err) {
t3_tp_set_offload_mode(adapter, 0);
@@ -1764,8 +1758,6 @@
if (!isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT))
return (0);
- /* Call back all registered clients */
- cxgb_remove_clients(tdev);
tdev->lldev = NULL;
cxgb_set_dummy_ops(tdev);
t3_tp_set_offload_mode(adapter, 0);
==== //depot/projects/vap/sys/dev/cxgb/cxgb_offload.c#5 (text+ko) ====
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_offload.c,v 1.12 2008/02/23 06:19:16 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_offload.c,v 1.14 2008/04/19 03:43:06 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,7 +63,6 @@
#include <dev/cxgb/cxgb_include.h>
#endif
-#include <net/if_vlan_var.h>
#include <net/route.h>
#define VALIDATE_TID 0
@@ -71,14 +70,11 @@
TAILQ_HEAD(, cxgb_client) client_list;
TAILQ_HEAD(, t3cdev) ofld_dev_list;
-TAILQ_HEAD(, adapter) adapter_list;
+
static struct mtx cxgb_db_lock;
-static struct rwlock adapter_list_lock;
-static const unsigned int MAX_ATIDS = 64 * 1024;
-static const unsigned int ATID_BASE = 0x100000;
static int inited = 0;
static inline int
@@ -89,6 +85,26 @@
return (isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT));
}
+static inline void
+register_tdev(struct t3cdev *tdev)
+{
+ static int unit;
+
+ mtx_lock(&cxgb_db_lock);
+ snprintf(tdev->name, sizeof(tdev->name), "ofld_dev%d", unit++);
+ TAILQ_INSERT_TAIL(&ofld_dev_list, tdev, entry);
+ mtx_unlock(&cxgb_db_lock);
+}
+
+static inline void
+unregister_tdev(struct t3cdev *tdev)
+{
+ mtx_lock(&cxgb_db_lock);
+ TAILQ_REMOVE(&ofld_dev_list, tdev, entry);
+ mtx_unlock(&cxgb_db_lock);
+}
+
+#ifdef TOE_ENABLED
/**
* cxgb_register_client - register an offload client
* @client: the client
@@ -178,291 +194,24 @@
}
mtx_unlock(&cxgb_db_lock);
}
+#endif
-static int
-is_offloading(struct ifnet *ifp)
+/**
+ * cxgb_ofld_recv - process n received offload packets
+ * @dev: the offload device
+ * @m: an array of offload packets
+ * @n: the number of offload packets
+ *
+ * Process an array of ingress offload packets. Each packet is forwarded
+ * to any active network taps and then passed to the offload device's receive
+ * method. We optimize passing packets to the receive method by passing
+ * it the whole array at once except when there are active taps.
+ */
+int
+cxgb_ofld_recv(struct t3cdev *dev, struct mbuf **m, int n)
{
- struct adapter *adapter;
- int port;
- rw_rlock(&adapter_list_lock);
- TAILQ_FOREACH(adapter, &adapter_list, adapter_entry) {
- for_each_port(adapter, port) {
- if (ifp == adapter->port[port].ifp) {
- rw_runlock(&adapter_list_lock);
- return 1;
- }
- }
- }
- rw_runlock(&adapter_list_lock);
- return 0;
-}
-
-static struct ifnet *
-get_iff_from_mac(adapter_t *adapter, const uint8_t *mac, unsigned int vlan)
-{
- int i;
-
- for_each_port(adapter, i) {
-#ifdef notyet
- const struct vlan_group *grp;
-#endif
- const struct port_info *p = &adapter->port[i];
- struct ifnet *ifp = p->ifp;
-
- if (!memcmp(p->hw_addr, mac, ETHER_ADDR_LEN)) {
-#ifdef notyet
-
- if (vlan && vlan != EVL_VLID_MASK) {
- grp = p->vlan_grp;
- dev = grp ? grp->vlan_devices[vlan] : NULL;
- } else
- while (dev->master)
- dev = dev->master;
-#endif
- return (ifp);
- }
- }
- return (NULL);
-}
-
-static inline void
-failover_fixup(adapter_t *adapter, int port)
-{
- if (adapter->params.rev == 0) {
- struct ifnet *ifp = adapter->port[port].ifp;
- struct cmac *mac = &adapter->port[port].mac;
- if (!(ifp->if_flags & IFF_UP)) {
- /* Failover triggered by the interface ifdown */
- t3_write_reg(adapter, A_XGM_TX_CTRL + mac->offset,
- F_TXEN);
- t3_read_reg(adapter, A_XGM_TX_CTRL + mac->offset);
- } else {
- /* Failover triggered by the interface link down */
- t3_write_reg(adapter, A_XGM_RX_CTRL + mac->offset, 0);
- t3_read_reg(adapter, A_XGM_RX_CTRL + mac->offset);
- t3_write_reg(adapter, A_XGM_RX_CTRL + mac->offset,
- F_RXEN);
- }
- }
-}
-
-static int
-cxgb_ulp_iscsi_ctl(adapter_t *adapter, unsigned int req, void *data)
-{
- int ret = 0;
- struct ulp_iscsi_info *uiip = data;
-
- switch (req) {
- case ULP_ISCSI_GET_PARAMS:
- uiip->llimit = t3_read_reg(adapter, A_ULPRX_ISCSI_LLIMIT);
- uiip->ulimit = t3_read_reg(adapter, A_ULPRX_ISCSI_ULIMIT);
- uiip->tagmask = t3_read_reg(adapter, A_ULPRX_ISCSI_TAGMASK);
- /*
- * On tx, the iscsi pdu has to be <= tx page size and has to
- * fit into the Tx PM FIFO.
- */
- uiip->max_txsz = min(adapter->params.tp.tx_pg_size,
- t3_read_reg(adapter, A_PM1_TX_CFG) >> 17);
- /* on rx, the iscsi pdu has to be < rx page size and the
- whole pdu + cpl headers has to fit into one sge buffer */
- /* also check the max rx data length programmed in TP */
- uiip->max_rxsz = min(uiip->max_rxsz,
- ((t3_read_reg(adapter, A_TP_PARA_REG2))
- >> S_MAXRXDATA) & M_MAXRXDATA);
- break;
- case ULP_ISCSI_SET_PARAMS:
- t3_write_reg(adapter, A_ULPRX_ISCSI_TAGMASK, uiip->tagmask);
- break;
- default:
- ret = (EOPNOTSUPP);
- }
- return ret;
-}
-
-/* Response queue used for RDMA events. */
-#define ASYNC_NOTIF_RSPQ 0
-
-static int
-cxgb_rdma_ctl(adapter_t *adapter, unsigned int req, void *data)
-{
- int ret = 0;
-
- switch (req) {
- case RDMA_GET_PARAMS: {
- struct rdma_info *req = data;
-
- req->udbell_physbase = rman_get_start(adapter->udbs_res);
- req->udbell_len = rman_get_size(adapter->udbs_res);
- req->tpt_base = t3_read_reg(adapter, A_ULPTX_TPT_LLIMIT);
- req->tpt_top = t3_read_reg(adapter, A_ULPTX_TPT_ULIMIT);
- req->pbl_base = t3_read_reg(adapter, A_ULPTX_PBL_LLIMIT);
- req->pbl_top = t3_read_reg(adapter, A_ULPTX_PBL_ULIMIT);
- req->rqt_base = t3_read_reg(adapter, A_ULPRX_RQ_LLIMIT);
- req->rqt_top = t3_read_reg(adapter, A_ULPRX_RQ_ULIMIT);
- req->kdb_addr = (void *)((unsigned long)rman_get_virtual(adapter->regs_res) + A_SG_KDOORBELL); break;
- }
- case RDMA_CQ_OP: {
- struct rdma_cq_op *req = data;
-
- /* may be called in any context */
- mtx_lock_spin(&adapter->sge.reg_lock);
- ret = t3_sge_cqcntxt_op(adapter, req->id, req->op,
- req->credits);
- mtx_unlock_spin(&adapter->sge.reg_lock);
- break;
- }
- case RDMA_GET_MEM: {
- struct ch_mem_range *t = data;
- struct mc7 *mem;
-
- if ((t->addr & 7) || (t->len & 7))
- return (EINVAL);
- if (t->mem_id == MEM_CM)
- mem = &adapter->cm;
- else if (t->mem_id == MEM_PMRX)
- mem = &adapter->pmrx;
- else if (t->mem_id == MEM_PMTX)
- mem = &adapter->pmtx;
- else
- return (EINVAL);
-
- ret = t3_mc7_bd_read(mem, t->addr/8, t->len/8, (u64 *)t->buf);
- if (ret)
- return (ret);
- break;
- }
- case RDMA_CQ_SETUP: {
- struct rdma_cq_setup *req = data;
-
- mtx_lock_spin(&adapter->sge.reg_lock);
- ret = t3_sge_init_cqcntxt(adapter, req->id, req->base_addr,
- req->size, ASYNC_NOTIF_RSPQ,
- req->ovfl_mode, req->credits,
- req->credit_thres);
- mtx_unlock_spin(&adapter->sge.reg_lock);
- break;
- }
- case RDMA_CQ_DISABLE:
- mtx_lock_spin(&adapter->sge.reg_lock);
- ret = t3_sge_disable_cqcntxt(adapter, *(unsigned int *)data);
- mtx_unlock_spin(&adapter->sge.reg_lock);
- break;
- case RDMA_CTRL_QP_SETUP: {
- struct rdma_ctrlqp_setup *req = data;
-
- mtx_lock_spin(&adapter->sge.reg_lock);
- ret = t3_sge_init_ecntxt(adapter, FW_RI_SGEEC_START, 0,
- SGE_CNTXT_RDMA, ASYNC_NOTIF_RSPQ,
- req->base_addr, req->size,
- FW_RI_TID_START, 1, 0);
- mtx_unlock_spin(&adapter->sge.reg_lock);
- break;
- }
- default:
- ret = EOPNOTSUPP;
- }
- return (ret);
-}
-
-static int
-cxgb_offload_ctl(struct t3cdev *tdev, unsigned int req, void *data)
-{
- struct adapter *adapter = tdev2adap(tdev);
- struct tid_range *tid;
- struct mtutab *mtup;
- struct iff_mac *iffmacp;
- struct ddp_params *ddpp;
- struct adap_ports *ports;
- struct ofld_page_info *rx_page_info;
- struct tp_params *tp = &adapter->params.tp;
- int port;
-
- switch (req) {
- case GET_MAX_OUTSTANDING_WR:
- *(unsigned int *)data = FW_WR_NUM;
- break;
- case GET_WR_LEN:
- *(unsigned int *)data = WR_FLITS;
- break;
- case GET_TX_MAX_CHUNK:
- *(unsigned int *)data = 1 << 20; /* 1MB */
- break;
- case GET_TID_RANGE:
- tid = data;
- tid->num = t3_mc5_size(&adapter->mc5) -
- adapter->params.mc5.nroutes -
- adapter->params.mc5.nfilters -
- adapter->params.mc5.nservers;
- tid->base = 0;
- break;
- case GET_STID_RANGE:
- tid = data;
- tid->num = adapter->params.mc5.nservers;
- tid->base = t3_mc5_size(&adapter->mc5) - tid->num -
- adapter->params.mc5.nfilters -
- adapter->params.mc5.nroutes;
- break;
- case GET_L2T_CAPACITY:
- *(unsigned int *)data = 2048;
- break;
- case GET_MTUS:
- mtup = data;
- mtup->size = NMTUS;
- mtup->mtus = adapter->params.mtus;
- break;
- case GET_IFF_FROM_MAC:
- iffmacp = data;
- iffmacp->dev = get_iff_from_mac(adapter, iffmacp->mac_addr,
- iffmacp->vlan_tag & EVL_VLID_MASK);
- break;
- case GET_DDP_PARAMS:
- ddpp = data;
- ddpp->llimit = t3_read_reg(adapter, A_ULPRX_TDDP_LLIMIT);
- ddpp->ulimit = t3_read_reg(adapter, A_ULPRX_TDDP_ULIMIT);
- ddpp->tag_mask = t3_read_reg(adapter, A_ULPRX_TDDP_TAGMASK);
- break;
- case GET_PORTS:
- ports = data;
- ports->nports = adapter->params.nports;
- for_each_port(adapter, port)
- ports->lldevs[port] = adapter->port[port].ifp;
- break;
- case FAILOVER:
- port = *(int *)data;
- t3_port_failover(adapter, port);
- failover_fixup(adapter, port);
- break;
- case FAILOVER_DONE:
- port = *(int *)data;
- t3_failover_done(adapter, port);
- break;
- case FAILOVER_CLEAR:
- t3_failover_clear(adapter);
- break;
- case GET_RX_PAGE_INFO:
- rx_page_info = data;
- rx_page_info->page_size = tp->rx_pg_size;
- rx_page_info->num = tp->rx_num_pgs;
- break;
- case ULP_ISCSI_GET_PARAMS:
- case ULP_ISCSI_SET_PARAMS:
- if (!offload_running(adapter))
- return (EAGAIN);
- return cxgb_ulp_iscsi_ctl(adapter, req, data);
- case RDMA_GET_PARAMS:
- case RDMA_CQ_OP:
- case RDMA_CQ_SETUP:
- case RDMA_CQ_DISABLE:
- case RDMA_CTRL_QP_SETUP:
- case RDMA_GET_MEM:
- if (!offload_running(adapter))
- return (EAGAIN);
- return cxgb_rdma_ctl(adapter, req, data);
- default:
- return (EOPNOTSUPP);
- }
- return 0;
+ return dev->recv(dev, m, n);
}
/*
@@ -491,195 +240,6 @@
dev->arp_update = dummy_neigh_update;
}
-/*
- * Free an active-open TID.
- */
-void *
-cxgb_free_atid(struct t3cdev *tdev, int atid)
-{
- struct tid_info *t = &(T3C_DATA(tdev))->tid_maps;
- union active_open_entry *p = atid2entry(t, atid);
- void *ctx = p->toe_tid.ctx;
-
- mtx_lock(&t->atid_lock);
- p->next = t->afree;
- t->afree = p;
- t->atids_in_use--;
- mtx_unlock(&t->atid_lock);
-
- return ctx;
-}
-
-/*
- * Free a server TID and return it to the free pool.
- */
-void
-cxgb_free_stid(struct t3cdev *tdev, int stid)
-{
- struct tid_info *t = &(T3C_DATA (tdev))->tid_maps;
- union listen_entry *p = stid2entry(t, stid);
-
- mtx_lock(&t->stid_lock);
- p->next = t->sfree;
- t->sfree = p;
- t->stids_in_use--;
- mtx_unlock(&t->stid_lock);
-}
-
-/*
- * Free a server TID and return it to the free pool.
- */
-void *
-cxgb_get_lctx(struct t3cdev *tdev, int stid)
-{
- struct tid_info *t = &(T3C_DATA (tdev))->tid_maps;
- union listen_entry *p = stid2entry(t, stid);
-
- return (p->toe_tid.ctx);
-}
-
-void
-cxgb_insert_tid(struct t3cdev *tdev, struct cxgb_client *client,
- void *ctx, unsigned int tid)
-{
- struct tid_info *t = &(T3C_DATA (tdev))->tid_maps;
-
- t->tid_tab[tid].client = client;
- t->tid_tab[tid].ctx = ctx;
- atomic_add_int(&t->tids_in_use, 1);
-}
-
-/*
- * Populate a TID_RELEASE WR. The mbuf must be already propely sized.
- */
-static inline void
-mk_tid_release(struct mbuf *m, unsigned int tid)
-{
- struct cpl_tid_release *req;
-
- m_set_priority(m, CPL_PRIORITY_SETUP);
- req = mtod(m, struct cpl_tid_release *);
- m->m_pkthdr.len = m->m_len = sizeof(*req);
- req->wr.wr_hi = htonl(V_WR_OP(FW_WROPCODE_FORWARD));
- OPCODE_TID(req) = htonl(MK_OPCODE_TID(CPL_TID_RELEASE, tid));
-}
-
-static void
-t3_process_tid_release_list(void *data, int pending)
-{
- struct mbuf *m;
- struct t3cdev *tdev = data;
- struct t3c_data *td = T3C_DATA (tdev);
-
- mtx_lock(&td->tid_release_lock);
- while (td->tid_release_list) {
- struct toe_tid_entry *p = td->tid_release_list;
-
- td->tid_release_list = (struct toe_tid_entry *)p->ctx;
- mtx_unlock(&td->tid_release_lock);
- m = m_get(M_WAIT, MT_DATA);
- mk_tid_release(m, p - td->tid_maps.tid_tab);
- cxgb_ofld_send(tdev, m);
- p->ctx = NULL;
- mtx_lock(&td->tid_release_lock);
- }
- mtx_unlock(&td->tid_release_lock);
-}
-
-/* use ctx as a next pointer in the tid release list */
-void
-cxgb_queue_tid_release(struct t3cdev *tdev, unsigned int tid)
-{
- struct t3c_data *td = T3C_DATA (tdev);
- struct toe_tid_entry *p = &td->tid_maps.tid_tab[tid];
-
- printf("queuing tid release\n");
-
- mtx_lock(&td->tid_release_lock);
- p->ctx = td->tid_release_list;
- td->tid_release_list = p;
-
- if (!p->ctx)
- taskqueue_enqueue(tdev->adapter->tq, &td->tid_release_task);
-
- mtx_unlock(&td->tid_release_lock);
-}
-
-/*
- * Remove a tid from the TID table. A client may defer processing its last
- * CPL message if it is locked at the time it arrives, and while the message
- * sits in the client's backlog the TID may be reused for another connection.
- * To handle this we atomically switch the TID association if it still points
- * to the original client context.
- */
-void
-cxgb_remove_tid(struct t3cdev *tdev, void *ctx, unsigned int tid)
-{
- struct tid_info *t = &(T3C_DATA (tdev))->tid_maps;
-
- if (tid >= t->ntids)
- panic("tid=%d >= t->ntids=%d", tid, t->ntids);
-
- if (tdev->type == T3A)
- atomic_cmpset_ptr((uintptr_t *)&t->tid_tab[tid].ctx, (long)NULL, (long)ctx);
- else {
- struct mbuf *m;
-
- m = m_get(M_NOWAIT, MT_DATA);
- if (__predict_true(m != NULL)) {
- mk_tid_release(m, tid);
- CTR1(KTR_CXGB, "releasing tid=%u", tid);
-
- cxgb_ofld_send(tdev, m);
- t->tid_tab[tid].ctx = NULL;
- } else
- cxgb_queue_tid_release(tdev, tid);
- }
- atomic_add_int(&t->tids_in_use, -1);
-}
-
-int
-cxgb_alloc_atid(struct t3cdev *tdev, struct cxgb_client *client,
- void *ctx)
-{
- int atid = -1;
- struct tid_info *t = &(T3C_DATA (tdev))->tid_maps;
-
- mtx_lock(&t->atid_lock);
- if (t->afree) {
- union active_open_entry *p = t->afree;
-
- atid = (p - t->atid_tab) + t->atid_base;
- t->afree = p->next;
- p->toe_tid.ctx = ctx;
- p->toe_tid.client = client;
- t->atids_in_use++;
- }
- mtx_unlock(&t->atid_lock);
- return atid;
-}
-
-int
-cxgb_alloc_stid(struct t3cdev *tdev, struct cxgb_client *client,
- void *ctx)
-{
- int stid = -1;
- struct tid_info *t = &(T3C_DATA (tdev))->tid_maps;
-
- mtx_lock(&t->stid_lock);
- if (t->sfree) {
- union listen_entry *p = t->sfree;
-
- stid = (p - t->stid_tab) + t->stid_base;
- t->sfree = p->next;
- p->toe_tid.ctx = ctx;
- p->toe_tid.client = client;
- t->stids_in_use++;
- }
- mtx_unlock(&t->stid_lock);
- return stid;
-}
-
static int
do_smt_write_rpl(struct t3cdev *dev, struct mbuf *m)
{
@@ -720,150 +280,6 @@
}
static int
-do_act_open_rpl(struct t3cdev *dev, struct mbuf *m)
-{
- struct cpl_act_open_rpl *rpl = cplhdr(m);
- unsigned int atid = G_TID(ntohl(rpl->atid));
- struct toe_tid_entry *toe_tid;
-
- toe_tid = lookup_atid(&(T3C_DATA (dev))->tid_maps, atid);
- if (toe_tid->ctx && toe_tid->client && toe_tid->client->handlers &&
- toe_tid->client->handlers[CPL_ACT_OPEN_RPL]) {
- return toe_tid->client->handlers[CPL_ACT_OPEN_RPL] (dev, m,
- toe_tid->ctx);
- } else {
- log(LOG_ERR, "%s: received clientless CPL command 0x%x\n",
- dev->name, CPL_ACT_OPEN_RPL);
- return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;
- }
-}
-
-static int
-do_stid_rpl(struct t3cdev *dev, struct mbuf *m)
-{
- union opcode_tid *p = cplhdr(m);
- unsigned int stid = G_TID(ntohl(p->opcode_tid));
- struct toe_tid_entry *toe_tid;
-
- toe_tid = lookup_stid(&(T3C_DATA (dev))->tid_maps, stid);
- if (toe_tid->ctx && toe_tid->client->handlers &&
- toe_tid->client->handlers[p->opcode]) {
- return toe_tid->client->handlers[p->opcode] (dev, m, toe_tid->ctx);
- } else {
- log(LOG_ERR, "%s: received clientless CPL command 0x%x\n",
- dev->name, p->opcode);
- return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;
- }
-}
-
-static int
-do_hwtid_rpl(struct t3cdev *dev, struct mbuf *m)
-{
- union opcode_tid *p = cplhdr(m);
- unsigned int hwtid;
- struct toe_tid_entry *toe_tid;
-
- DPRINTF("do_hwtid_rpl opcode=0x%x\n", p->opcode);
- hwtid = G_TID(ntohl(p->opcode_tid));
-
- toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid);
- if (toe_tid->ctx && toe_tid->client->handlers &&
- toe_tid->client->handlers[p->opcode]) {
- return toe_tid->client->handlers[p->opcode]
- (dev, m, toe_tid->ctx);
- } else {
- log(LOG_ERR, "%s: received clientless CPL command 0x%x\n",
- dev->name, p->opcode);
- return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;
- }
-}
-
-static int
-do_cr(struct t3cdev *dev, struct mbuf *m)
-{
- struct cpl_pass_accept_req *req = cplhdr(m);
- unsigned int stid = G_PASS_OPEN_TID(ntohl(req->tos_tid));
- struct toe_tid_entry *toe_tid;
-
- toe_tid = lookup_stid(&(T3C_DATA (dev))->tid_maps, stid);
- if (toe_tid->ctx && toe_tid->client->handlers &&
- toe_tid->client->handlers[CPL_PASS_ACCEPT_REQ]) {
- return toe_tid->client->handlers[CPL_PASS_ACCEPT_REQ]
- (dev, m, toe_tid->ctx);
- } else {
- log(LOG_ERR, "%s: received clientless CPL command 0x%x\n",
- dev->name, CPL_PASS_ACCEPT_REQ);
- return CPL_RET_BUF_DONE | CPL_RET_BAD_MSG;
- }
-}
-
-static int
-do_abort_req_rss(struct t3cdev *dev, struct mbuf *m)
-{
- union opcode_tid *p = cplhdr(m);
- unsigned int hwtid = G_TID(ntohl(p->opcode_tid));
- struct toe_tid_entry *toe_tid;
-
- toe_tid = lookup_tid(&(T3C_DATA (dev))->tid_maps, hwtid);
- if (toe_tid->ctx && toe_tid->client->handlers &&
- toe_tid->client->handlers[p->opcode]) {
- return toe_tid->client->handlers[p->opcode]
- (dev, m, toe_tid->ctx);
- } else {
- struct cpl_abort_req_rss *req = cplhdr(m);
- struct cpl_abort_rpl *rpl;
-
- struct mbuf *m = m_get(M_NOWAIT, MT_DATA);
- if (!m) {
- log(LOG_NOTICE, "do_abort_req_rss: couldn't get mbuf!\n");
- goto out;
- }
-
- m_set_priority(m, CPL_PRIORITY_DATA);
-#if 0
- __skb_put(skb, sizeof(struct cpl_abort_rpl));
-#endif
- rpl = cplhdr(m);
- rpl->wr.wr_hi =
- htonl(V_WR_OP(FW_WROPCODE_OFLD_HOST_ABORT_CON_RPL));
- rpl->wr.wr_lo = htonl(V_WR_TID(GET_TID(req)));
- OPCODE_TID(rpl) =
- htonl(MK_OPCODE_TID(CPL_ABORT_RPL, GET_TID(req)));
- rpl->cmd = req->status;
- cxgb_ofld_send(dev, m);
- out:
- return CPL_RET_BUF_DONE;
- }
-}
-
-static int
-do_act_establish(struct t3cdev *dev, struct mbuf *m)
-{
- struct cpl_act_establish *req;
- unsigned int atid;
- struct toe_tid_entry *toe_tid;
-
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 17:02:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 76BF6106566C; Sun, 20 Apr 2008 17:02:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2101D106564A
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 17:02:19 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 11CE68FC1B
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 17:02:19 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KH2Igp060085
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 17:02:18 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KH2IFa060081
for perforce@freebsd.org; Sun, 20 Apr 2008 17:02:18 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 17:02:18 GMT
Message-Id: <200804201702.m3KH2IFa060081@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140309 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 17:02:19 -0000
http://perforce.freebsd.org/chv.cgi?CH=140309
Change 140309 by hselasky@hselasky_laptop001 on 2008/04/20 17:02:09
Minor software change in USB LPT driver:
If the device is multifunctional, it can be a problem to use a
software interval of 1 second on a control endpoint, hence it
will block all other control requests for that long on the
same USB device. Use a watchdog instead to do polling.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/ulpt.c#44 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/ulpt.c#44 (text+ko) ====
@@ -87,6 +87,7 @@
struct ulpt_softc {
struct usb_cdev sc_cdev;
struct mtx sc_mtx;
+ struct usb_callout sc_watchdog;
device_t sc_dev;
struct usbd_xfer *sc_xfer[ULPT_N_TRANSFER];
@@ -114,6 +115,7 @@
static usbd_callback_t ulpt_read_clear_stall_callback;
static usbd_callback_t ulpt_status_callback;
static usbd_callback_t ulpt_reset_callback;
+static void ulpt_watchdog(void *arg);
static void
ulpt_write_callback(struct usbd_xfer *xfer)
@@ -254,9 +256,9 @@
else if (new_status & LPS_NERR)
log(LOG_NOTICE, "%s: output error\n",
device_get_nameunit(sc->sc_dev));
+ break;
case USBD_ST_SETUP:
-tr_setup:
req.bmRequestType = UT_READ_CLASS_INTERFACE;
req.bRequest = UR_GET_PORT_STATUS;
USETW(req.wValue, 0);
@@ -270,16 +272,16 @@
xfer->frlengths[1] = 1;
xfer->nframes = 2;
usbd_start_hardware(xfer);
+ break;
- return;
-
default: /* Error */
DPRINTF(0, "error=%s\n", usbd_errstr(xfer->error));
if (xfer->error != USBD_ERR_CANCELLED) {
- goto tr_setup;
+ /* wait for next watchdog timeout */
}
- return;
+ break;
}
+ return;
}
static void
@@ -359,7 +361,6 @@
.mh.bufsize = sizeof(usb_device_request_t) + 1,
.mh.callback = &ulpt_status_callback,
.mh.timeout = 1000, /* 1 second */
- .mh.interval = 1000, /* 1 second */
},
[3] = {
@@ -525,6 +526,9 @@
mtx_init(&(sc->sc_mtx), "ulpt lock", NULL, MTX_DEF | MTX_RECURSE);
+ usb_callout_init_mtx(&(sc->sc_watchdog),
+ &(sc->sc_mtx), CALLOUT_RETURNUNLOCKED);
+
/* search through all the descriptors looking for bidir mode */
while (iface_alt_index < 32) {
@@ -637,8 +641,8 @@
/* start reading of status */
mtx_lock(&(sc->sc_mtx));
- usbd_transfer_start(sc->sc_xfer[2]);
- mtx_unlock(&(sc->sc_mtx));
+
+ ulpt_watchdog(sc); /* will unlock mutex */
return (0);
@@ -656,8 +660,14 @@
usb_cdev_detach(&(sc->sc_cdev));
+ mtx_lock(&(sc->sc_mtx));
+ usb_callout_stop(&(sc->sc_watchdog));
+ mtx_unlock(&(sc->sc_mtx));
+
usbd_transfer_unsetup(sc->sc_xfer, ULPT_N_TRANSFER);
+ usb_callout_drain(&(sc->sc_watchdog));
+
mtx_destroy(&(sc->sc_mtx));
return (0);
@@ -710,6 +720,22 @@
#endif
+static void
+ulpt_watchdog(void *arg)
+{
+ struct ulpt_softc *sc = arg;
+
+ mtx_assert(&(sc->sc_mtx), MA_OWNED);
+
+ usbd_transfer_start(sc->sc_xfer[2]);
+
+ usb_callout_reset(&(sc->sc_watchdog),
+ hz, &ulpt_watchdog, sc);
+
+ mtx_unlock(&(sc->sc_mtx));
+ return;
+}
+
static devclass_t ulpt_devclass;
static device_method_t ulpt_methods[] = {
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 17:15:32 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C7DE81065671; Sun, 20 Apr 2008 17:15:32 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 87E3B1065673
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 17:15:32 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 777BD8FC21
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 17:15:32 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KHFWl2061694
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 17:15:32 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KHFWod061692
for perforce@freebsd.org; Sun, 20 Apr 2008 17:15:32 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 17:15:32 GMT
Message-Id: <200804201715.m3KHFWod061692@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140310 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 17:15:33 -0000
http://perforce.freebsd.org/chv.cgi?CH=140310
Change 140310 by hselasky@hselasky_laptop001 on 2008/04/20 17:15:07
Style change: Prototypes should be on a single line.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/if_aue.c#47 edit
.. //depot/projects/usb/src/sys/dev/usb/if_axe.c#49 edit
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#42 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#44 edit
.. //depot/projects/usb/src/sys/dev/usb/if_rue.c#42 edit
.. //depot/projects/usb/src/sys/dev/usb/if_udav.c#45 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/if_aue.c#47 (text+ko) ====
@@ -216,27 +216,13 @@
static usbd_callback_t aue_bulk_write_clear_stall_callback;
static usbd_callback_t aue_bulk_write_callback;
-static void
-aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req,
- void *data);
-static uint8_t
- aue_cfg_csr_read_1(struct aue_softc *sc, uint16_t reg);
-
-static uint16_t
- aue_cfg_csr_read_2(struct aue_softc *sc, uint16_t reg);
-
-static void
- aue_cfg_csr_write_1(struct aue_softc *sc, uint16_t reg, uint8_t val);
-
-static void
- aue_cfg_csr_write_2(struct aue_softc *sc, uint16_t reg, uint16_t val);
-
-static void
-aue_cfg_eeprom_getword(struct aue_softc *sc, uint8_t addr,
- uint8_t *dest);
-static void
-aue_cfg_read_eeprom(struct aue_softc *sc, uint8_t *dest,
- uint16_t off, uint16_t len);
+static void aue_cfg_do_request(struct aue_softc *sc, usb_device_request_t *req, void *data);
+static uint8_t aue_cfg_csr_read_1(struct aue_softc *sc, uint16_t reg);
+static uint16_t aue_cfg_csr_read_2(struct aue_softc *sc, uint16_t reg);
+static void aue_cfg_csr_write_1(struct aue_softc *sc, uint16_t reg, uint8_t val);
+static void aue_cfg_csr_write_2(struct aue_softc *sc, uint16_t reg, uint16_t val);
+static void aue_cfg_eeprom_getword(struct aue_softc *sc, uint8_t addr, uint8_t *dest);
+static void aue_cfg_read_eeprom(struct aue_softc *sc, uint8_t *dest, uint16_t off, uint16_t len);
static miibus_readreg_t aue_cfg_miibus_readreg;
static miibus_writereg_t aue_cfg_miibus_writereg;
@@ -253,32 +239,15 @@
static usbd_config_td_command_t aue_cfg_pre_stop;
static usbd_config_td_command_t aue_cfg_stop;
-static void
- aue_cfg_reset_pegasus_II(struct aue_softc *sc);
-
-static void
- aue_cfg_reset(struct aue_softc *sc);
-
-static void
- aue_start_cb(struct ifnet *ifp);
-
-static void
- aue_init_cb(void *arg);
-
-static void
- aue_start_transfers(struct aue_softc *sc);
-
-static int
- aue_ifmedia_upd_cb(struct ifnet *ifp);
-
-static void
- aue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr);
-
-static int
- aue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
-
-static void
- aue_watchdog(void *arg);
+static void aue_cfg_reset_pegasus_II(struct aue_softc *sc);
+static void aue_cfg_reset(struct aue_softc *sc);
+static void aue_start_cb(struct ifnet *ifp);
+static void aue_init_cb(void *arg);
+static void aue_start_transfers(struct aue_softc *sc);
+static int aue_ifmedia_upd_cb(struct ifnet *ifp);
+static void aue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr);
+static int aue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
+static void aue_watchdog(void *arg);
static const struct usbd_config aue_config[AUE_ENDPT_MAX] = {
==== //depot/projects/usb/src/sys/dev/usb/if_axe.c#49 (text+ko) ====
@@ -179,9 +179,7 @@
static usbd_callback_t axe_bulk_write_clear_stall_callback;
static usbd_callback_t axe_bulk_write_callback;
-static void
-axe_cfg_cmd(struct axe_softc *sc, uint16_t cmd, uint16_t index,
- uint16_t val, void *buf);
+static void axe_cfg_cmd(struct axe_softc *sc, uint16_t cmd, uint16_t index, uint16_t val, void *buf);
static miibus_readreg_t axe_cfg_miibus_readreg;
static miibus_writereg_t axe_cfg_miibus_writereg;
@@ -198,35 +196,16 @@
static usbd_config_td_command_t axe_cfg_pre_stop;
static usbd_config_td_command_t axe_cfg_stop;
-static int
- axe_ifmedia_upd_cb(struct ifnet *ifp);
-
-static void
- axe_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr);
-
-static void
- axe_cfg_reset(struct axe_softc *sc);
-
-static void
- axe_start_cb(struct ifnet *ifp);
-
-static void
- axe_start_transfers(struct axe_softc *sc);
-
-static void
- axe_init_cb(void *arg);
-
-static int
- axe_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
-
-static void
- axe_watchdog(void *arg);
-
-static void
- axe_cfg_ax88178_init(struct axe_softc *);
-
-static void
- axe_cfg_ax88772_init(struct axe_softc *);
+static int axe_ifmedia_upd_cb(struct ifnet *ifp);
+static void axe_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr);
+static void axe_cfg_reset(struct axe_softc *sc);
+static void axe_start_cb(struct ifnet *ifp);
+static void axe_start_transfers(struct axe_softc *sc);
+static void axe_init_cb(void *arg);
+static int axe_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
+static void axe_watchdog(void *arg);
+static void axe_cfg_ax88178_init(struct axe_softc *);
+static void axe_cfg_ax88772_init(struct axe_softc *);
static const struct usbd_config axe_config[AXE_ENDPT_MAX] = {
==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#42 (text+ko) ====
@@ -120,44 +120,19 @@
static usbd_config_td_command_t cue_cfg_pre_stop;
static usbd_config_td_command_t cue_cfg_stop;
-static void
-cue_cfg_do_request(struct cue_softc *sc, usb_device_request_t *req,
- void *data);
-static uint8_t
- cue_cfg_csr_read_1(struct cue_softc *sc, uint16_t reg);
-
-static uint16_t
- cue_cfg_csr_read_2(struct cue_softc *sc, uint8_t reg);
-
-static void
- cue_cfg_csr_write_1(struct cue_softc *sc, uint16_t reg, uint16_t val);
-
-static void
-cue_cfg_mem(struct cue_softc *sc, uint8_t cmd, uint16_t addr,
- void *buf, uint16_t len);
-static void
- cue_cfg_getmac(struct cue_softc *sc, void *buf);
-
-static uint32_t
- cue_mchash(const uint8_t *addr);
-
-static void
- cue_cfg_reset(struct cue_softc *sc);
-
-static void
- cue_start_cb(struct ifnet *ifp);
-
-static void
- cue_start_transfers(struct cue_softc *sc);
-
-static void
- cue_init_cb(void *arg);
-
-static int
- cue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
-
-static void
- cue_watchdog(void *arg);
+static void cue_cfg_do_request(struct cue_softc *sc, usb_device_request_t *req, void *data);
+static uint8_t cue_cfg_csr_read_1(struct cue_softc *sc, uint16_t reg);
+static uint16_t cue_cfg_csr_read_2(struct cue_softc *sc, uint8_t reg);
+static void cue_cfg_csr_write_1(struct cue_softc *sc, uint16_t reg, uint16_t val);
+static void cue_cfg_mem(struct cue_softc *sc, uint8_t cmd, uint16_t addr, void *buf, uint16_t len);
+static void cue_cfg_getmac(struct cue_softc *sc, void *buf);
+static uint32_t cue_mchash(const uint8_t *addr);
+static void cue_cfg_reset(struct cue_softc *sc);
+static void cue_start_cb(struct ifnet *ifp);
+static void cue_start_transfers(struct cue_softc *sc);
+static void cue_init_cb(void *arg);
+static int cue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
+static void cue_watchdog(void *arg);
#define DPRINTF(...)
==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#44 (text+ko) ====
@@ -163,35 +163,16 @@
static usbd_config_td_command_t kue_cfg_pre_stop;
static usbd_config_td_command_t kue_cfg_stop;
-static void
-kue_cfg_do_request(struct kue_softc *sc, usb_device_request_t *req,
- void *data);
-static void
- kue_cfg_setword(struct kue_softc *sc, uint8_t breq, uint16_t word);
-
-static void
-kue_cfg_ctl(struct kue_softc *sc, uint8_t rw, uint8_t breq,
- uint16_t val, void *data, uint16_t len);
-static void
- kue_cfg_load_fw(struct kue_softc *sc);
-
-static void
- kue_cfg_reset(struct kue_softc *sc);
-
-static void
- kue_start_cb(struct ifnet *ifp);
-
-static void
- kue_start_transfers(struct kue_softc *sc);
-
-static void
- kue_init_cb(void *arg);
-
-static int
- kue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
-
-static void
- kue_watchdog(void *arg);
+static void kue_cfg_do_request(struct kue_softc *sc, usb_device_request_t *req, void *data);
+static void kue_cfg_setword(struct kue_softc *sc, uint8_t breq, uint16_t word);
+static void kue_cfg_ctl(struct kue_softc *sc, uint8_t rw, uint8_t breq, uint16_t val, void *data, uint16_t len);
+static void kue_cfg_load_fw(struct kue_softc *sc);
+static void kue_cfg_reset(struct kue_softc *sc);
+static void kue_start_cb(struct ifnet *ifp);
+static void kue_start_transfers(struct kue_softc *sc);
+static void kue_init_cb(void *arg);
+static int kue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
+static void kue_watchdog(void *arg);
#define DPRINTF(...)
==== //depot/projects/usb/src/sys/dev/usb/if_rue.c#42 (text+ko) ====
@@ -156,57 +156,27 @@
static usbd_config_td_command_t rue_cfg_pre_stop;
static usbd_config_td_command_t rue_cfg_stop;
-static void
-rue_cfg_do_request(struct rue_softc *sc, usb_device_request_t *req,
- void *data);
-static void
-rue_cfg_read_mem(struct rue_softc *sc, uint16_t addr, void *buf,
- uint16_t len);
-static void
-rue_cfg_write_mem(struct rue_softc *sc, uint16_t addr, void *buf,
- uint16_t len);
-static uint8_t
- rue_cfg_csr_read_1(struct rue_softc *sc, uint16_t reg);
-
-static uint16_t
- rue_cfg_csr_read_2(struct rue_softc *sc, uint16_t reg);
-
-static void
- rue_cfg_csr_write_1(struct rue_softc *sc, uint16_t reg, uint8_t val);
-
-static void
- rue_cfg_csr_write_2(struct rue_softc *sc, uint16_t reg, uint16_t val);
-
-static void
- rue_cfg_csr_write_4(struct rue_softc *sc, int reg, uint32_t val);
+static void rue_cfg_do_request(struct rue_softc *sc, usb_device_request_t *req, void *data);
+static void rue_cfg_read_mem(struct rue_softc *sc, uint16_t addr, void *buf, uint16_t len);
+static void rue_cfg_write_mem(struct rue_softc *sc, uint16_t addr, void *buf, uint16_t len);
+static uint8_t rue_cfg_csr_read_1(struct rue_softc *sc, uint16_t reg);
+static uint16_t rue_cfg_csr_read_2(struct rue_softc *sc, uint16_t reg);
+static void rue_cfg_csr_write_1(struct rue_softc *sc, uint16_t reg, uint8_t val);
+static void rue_cfg_csr_write_2(struct rue_softc *sc, uint16_t reg, uint16_t val);
+static void rue_cfg_csr_write_4(struct rue_softc *sc, int reg, uint32_t val);
static miibus_readreg_t rue_cfg_miibus_readreg;
static miibus_writereg_t rue_cfg_miibus_writereg;
static miibus_statchg_t rue_cfg_miibus_statchg;
-static void
- rue_cfg_reset(struct rue_softc *sc);
-
-static void
- rue_start_cb(struct ifnet *ifp);
-
-static void
- rue_start_transfers(struct rue_softc *sc);
-
-static void
- rue_init_cb(void *arg);
-
-static int
- rue_ifmedia_upd_cb(struct ifnet *ifp);
-
-static void
- rue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr);
-
-static int
- rue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
-
-static void
- rue_watchdog(void *arg);
+static void rue_cfg_reset(struct rue_softc *sc);
+static void rue_start_cb(struct ifnet *ifp);
+static void rue_start_transfers(struct rue_softc *sc);
+static void rue_init_cb(void *arg);
+static int rue_ifmedia_upd_cb(struct ifnet *ifp);
+static void rue_ifmedia_sts_cb(struct ifnet *ifp, struct ifmediareq *ifmr);
+static int rue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
+static void rue_watchdog(void *arg);
static const struct usbd_config rue_config[RUE_ENDPT_MAX] = {
==== //depot/projects/usb/src/sys/dev/usb/if_udav.c#45 (text+ko) ====
@@ -112,44 +112,19 @@
static usbd_config_td_command_t udav_cfg_ifmedia_change;
static usbd_config_td_command_t udav_cfg_tick;
-static void
-udav_cfg_do_request(struct udav_softc *sc, usb_device_request_t *req,
- void *data);
-static void
-udav_cfg_csr_read(struct udav_softc *sc, uint16_t offset, void *buf,
- uint16_t len);
-static void
-udav_cfg_csr_write(struct udav_softc *sc, uint16_t offset, void *buf,
- uint16_t len);
-static uint8_t
- udav_cfg_csr_read1(struct udav_softc *sc, uint16_t offset);
-
-static void
-udav_cfg_csr_write1(struct udav_softc *sc, uint16_t offset,
- uint8_t ch);
-static void
- udav_init_cb(void *arg);
-
-static void
- udav_cfg_reset(struct udav_softc *sc);
-
-static void
- udav_start_cb(struct ifnet *ifp);
-
-static void
- udav_start_transfers(struct udav_softc *sc);
-
-static int
- udav_ioctl_cb(struct ifnet *ifp, u_long cmd, caddr_t data);
-
-static void
- udav_watchdog(void *arg);
-
-static int
- udav_ifmedia_change_cb(struct ifnet *ifp);
-
-static void
- udav_ifmedia_status_cb(struct ifnet *ifp, struct ifmediareq *ifmr);
+static void udav_cfg_do_request(struct udav_softc *sc, usb_device_request_t *req, void *data);
+static void udav_cfg_csr_read(struct udav_softc *sc, uint16_t offset, void *buf, uint16_t len);
+static void udav_cfg_csr_write(struct udav_softc *sc, uint16_t offset, void *buf, uint16_t len);
+static uint8_t udav_cfg_csr_read1(struct udav_softc *sc, uint16_t offset);
+static void udav_cfg_csr_write1(struct udav_softc *sc, uint16_t offset, uint8_t ch);
+static void udav_init_cb(void *arg);
+static void udav_cfg_reset(struct udav_softc *sc);
+static void udav_start_cb(struct ifnet *ifp);
+static void udav_start_transfers(struct udav_softc *sc);
+static int udav_ioctl_cb(struct ifnet *ifp, u_long cmd, caddr_t data);
+static void udav_watchdog(void *arg);
+static int udav_ifmedia_change_cb(struct ifnet *ifp);
+static void udav_ifmedia_status_cb(struct ifnet *ifp, struct ifmediareq *ifmr);
static miibus_readreg_t udav_cfg_miibus_readreg;
static miibus_writereg_t udav_cfg_miibus_writereg;
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 17:17:35 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 699551065678; Sun, 20 Apr 2008 17:17:35 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 121D9106566B
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 17:17:35 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 030F08FC1B
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 17:17:35 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KHHY4M061757
for <perforce@FreeBSD.org>; Sun, 20 Apr 2008 17:17:34 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KHHYXT061755
for perforce@freebsd.org; Sun, 20 Apr 2008 17:17:34 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Sun, 20 Apr 2008 17:17:34 GMT
Message-Id: <200804201717.m3KHHYXT061755@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140312 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 17:17:35 -0000
http://perforce.freebsd.org/chv.cgi?CH=140312
Change 140312 by hselasky@hselasky_laptop001 on 2008/04/20 17:17:05
Non functional change: Add safety "do { } while (0)" wrapper
to debug print macros.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/if_cue.c#43 edit
.. //depot/projects/usb/src/sys/dev/usb/if_kue.c#45 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/if_cue.c#43 (text+ko) ====
@@ -134,7 +134,7 @@
static int cue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
static void cue_watchdog(void *arg);
-#define DPRINTF(...)
+#define DPRINTF(...) do { } while (0)
static const struct usbd_config cue_config[CUE_ENDPT_MAX] = {
==== //depot/projects/usb/src/sys/dev/usb/if_kue.c#45 (text+ko) ====
@@ -174,7 +174,7 @@
static int kue_ioctl_cb(struct ifnet *ifp, u_long command, caddr_t data);
static void kue_watchdog(void *arg);
-#define DPRINTF(...)
+#define DPRINTF(...) do { } while (0)
static const struct usbd_config kue_config[KUE_ENDPT_MAX] = {
From owner-p4-projects@FreeBSD.ORG Sun Apr 20 19:28:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 685C81065671; Sun, 20 Apr 2008 19:28:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2A450106566B
for <perforce@freebsd.org>; Sun, 20 Apr 2008 19:28:00 +0000 (UTC)
(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 19B338FC0C
for <perforce@freebsd.org>; Sun, 20 Apr 2008 19:28:00 +0000 (UTC)
(envelope-from peter-gmail@wemm.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3KJRxuX073235
for <perforce@freebsd.org>; Sun, 20 Apr 2008 19:27:59 GMT
(envelope-from peter-gmail@wemm.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3KJRxDa073233
for perforce@freebsd.org; Sun, 20 Apr 2008 19:27:59 GMT
(envelope-from peter-gmail@wemm.org)
Date: Sun, 20 Apr 2008 19:27:59 GMT
Message-Id: <200804201927.m3KJRxDa073233@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
peter-gmail@wemm.org using -f
From: Peter Wemm <peter@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140323 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sun, 20 Apr 2008 19:28:00 -0000
http://perforce.freebsd.org/chv.cgi?CH=140323
Change 140323 by peter@peter_overcee on 2008/04/20 19:27:58
IFC @140322
Affected files ...
.. //depot/projects/hammer/ObsoleteFiles.inc#51 integrate
.. //depot/projects/hammer/lib/libc/stdlib/strfmon.c#8 integrate
.. //depot/projects/hammer/lib/libc/sys/cpuset.2#2 integrate
.. //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#2 integrate
.. //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#33 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.dsl#6 integrate
.. //depot/projects/hammer/release/doc/share/sgml/release.ent#24 integrate
.. //depot/projects/hammer/sys/amd64/amd64/machdep.c#167 integrate
.. //depot/projects/hammer/sys/amd64/conf/GENERIC#107 integrate
.. //depot/projects/hammer/sys/conf/NOTES#143 integrate
.. //depot/projects/hammer/sys/conf/files#180 integrate
.. //depot/projects/hammer/sys/conf/files.pc98#66 integrate
.. //depot/projects/hammer/sys/contrib/pf/net/pf.c#37 integrate
.. //depot/projects/hammer/sys/dev/ata/ata-all.c#68 integrate
.. //depot/projects/hammer/sys/dev/awi/am79c930.c#6 delete
.. //depot/projects/hammer/sys/dev/awi/am79c930reg.h#3 delete
.. //depot/projects/hammer/sys/dev/awi/am79c930var.h#3 delete
.. //depot/projects/hammer/sys/dev/awi/awi.c#22 delete
.. //depot/projects/hammer/sys/dev/awi/awireg.h#3 delete
.. //depot/projects/hammer/sys/dev/awi/awivar.h#8 delete
.. //depot/projects/hammer/sys/dev/awi/if_awi_pccard.c#18 delete
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_l2t.c#7 delete
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_l2t.h#6 delete
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#19 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#9 integrate
.. //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.h#9 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#6 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#7 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_listen.c#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom.c#4 integrate
.. //depot/projects/hammer/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate
.. //depot/projects/hammer/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/hammer/sys/dev/sound/pci/hda/hdac.c#16 integrate
.. //depot/projects/hammer/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/hammer/sys/dev/usb/usbdevs#101 integrate
.. //depot/projects/hammer/sys/i386/conf/GENERIC#65 integrate
.. //depot/projects/hammer/sys/i386/conf/PAE#26 integrate
.. //depot/projects/hammer/sys/ia64/ia64/mp_machdep.c#22 integrate
.. //depot/projects/hammer/sys/ia64/ia64/pmap.c#67 integrate
.. //depot/projects/hammer/sys/modules/Makefile#124 integrate
.. //depot/projects/hammer/sys/modules/awi/Makefile#5 delete
.. //depot/projects/hammer/sys/modules/cxgb/cxgb/Makefile#6 integrate
.. //depot/projects/hammer/sys/modules/cxgb/tom/Makefile#4 integrate
.. //depot/projects/hammer/sys/modules/firmware/Makefile#2 integrate
.. //depot/projects/hammer/sys/net/if.c#75 integrate
.. //depot/projects/hammer/sys/net/if_media.h#22 integrate
.. //depot/projects/hammer/sys/netgraph/ng_base.c#59 integrate
.. //depot/projects/hammer/sys/netinet/in_pcb.c#57 integrate
.. //depot/projects/hammer/sys/netinet/ip_fw2.c#95 integrate
.. //depot/projects/hammer/sys/netinet/ip_output.c#70 integrate
.. //depot/projects/hammer/sys/netinet/tcp_offload.h#2 integrate
.. //depot/projects/hammer/sys/netinet/tcp_syncache.c#59 integrate
.. //depot/projects/hammer/sys/netinet/tcp_var.h#53 integrate
.. //depot/projects/hammer/sys/netinet6/in6_pcb.c#36 integrate
.. //depot/projects/hammer/sys/pc98/cbus/clock.c#15 integrate
.. //depot/projects/hammer/sys/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/hammer/sys/pc98/conf/GENERIC#51 integrate
.. //depot/projects/hammer/sys/pc98/include/clock.h#4 integrate
.. //depot/projects/hammer/sys/security/audit/audit_arg.c#14 integrate
.. //depot/projects/hammer/sys/security/mac/mac_inet.c#8 integrate
.. //depot/projects/hammer/usr.bin/procstat/procstat.1#2 integrate
Differences ...
==== //depot/projects/hammer/ObsoleteFiles.inc#51 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.137 2008/04/20 16:03:19 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -19,6 +19,22 @@
OLD_FILES+=usr/sbin/pkg_sign
OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
+# 20080325: tzdata2008b import
+OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
+OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
+# 20080314: stack_print(9) mlink fixed
+OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
+# 20080312: libkse removal
+OLD_FILES+=usr/include/sys/kse.h
+OLD_FILES+=usr/lib/libkse.so
+OLD_LIBS+=usr/lib/libkse.so.3
+OLD_FILES+=usr/share/man/man2/kse.2.gz
+OLD_FILES+=usr/share/man/man2/kse_create.2.gz
+OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
+OLD_FILES+=usr/share/man/man2/kse_release.2.gz
+OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
+OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
+OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
==== //depot/projects/hammer/lib/libc/stdlib/strfmon.c#8 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.18 2008/04/19 07:22:58 ru Exp $");
#include <sys/types.h>
#include <ctype.h>
@@ -67,6 +67,8 @@
while (isdigit((unsigned char)*fmt)) { \
VAR *= 10; \
VAR += *fmt - '0'; \
+ if (VAR < 0) \
+ goto e2big_error; \
fmt++; \
} \
} while (0)
@@ -187,7 +189,7 @@
/* Do we have enough space to put number with
* required width ?
*/
- if (dst + width >= s + maxsize)
+ if ((unsigned int)width >= maxsize - (dst - s))
goto e2big_error;
}
@@ -196,6 +198,8 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(left_prec);
+ if ((unsigned int)left_prec >= maxsize - (dst - s))
+ goto e2big_error;
}
/* Right precision */
@@ -203,6 +207,9 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(right_prec);
+ if ((unsigned int)right_prec >= maxsize - (dst - s) -
+ left_prec)
+ goto e2big_error;
}
/* Conversion Characters */
@@ -218,6 +225,8 @@
goto format_error;
}
+ if (currency_symbol != NULL)
+ free(currency_symbol);
if (flags & USE_INTL_CURRENCY) {
currency_symbol = strdup(lc->int_curr_symbol);
if (currency_symbol != NULL)
@@ -246,6 +255,8 @@
pad_size = 0;
}
+ if (asciivalue != NULL)
+ free(asciivalue);
asciivalue = __format_grouped_double(value, &flags,
left_prec, right_prec, pad_char);
if (asciivalue == NULL)
==== //depot/projects/hammer/lib/libc/sys/cpuset.2#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.1 2008/03/29 10:06:30 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -36,6 +36,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset "cpusetid_t *setid"
==== //depot/projects/hammer/lib/libc/sys/cpuset_getaffinity.2#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.1 2008/03/29 10:26:29 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -35,6 +35,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset_getaffinity "cpulevel_t level" "cpuwhich_t which" "id_t id" "size_t setsize" "cpuset_t *mask"
==== //depot/projects/hammer/release/doc/en_US.ISO8859-1/relnotes/article.sgml#33 (text+ko) ====
@@ -7,9 +7,6 @@
<!-- Text constants which probably don't need to be changed.-->
-<!-- The marker for MFCs. -->
-<!ENTITY merged "[MERGED]">
-
<!ENTITY % include.historic "IGNORE">
<!ENTITY % no.include.historic "IGNORE">
]>
@@ -20,7 +17,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1085 2008/04/17 00:57:34 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1088 2008/04/20 18:17:33 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -145,27 +142,27 @@
assignment. The &man.cpuset.1; userland utility has been added
to allow manipulation of processor sets.</para>
- <para>The &man.ddb.4; kernel debugger now has an output capture
+ <para role="merged">The &man.ddb.4; kernel debugger now has an output capture
facility. Input and output from &man.ddb.4; can now be captured
to a memory buffer for later inspection using &man.sysctl.8; or
a textdump. The new <command>capture</command> command controls
- this feature. &merged;</para>
+ this feature.</para>
- <para>The &man.ddb.4; debugger now supports a simple scripting
+ <para role="merged">The &man.ddb.4; debugger now supports a simple scripting
facility, which supports a set of named scripts consisting of a
set of &man.ddb.4; commands. These commands can be managed from
within &man.ddb.4; or with the use of the new &man.ddb.8;
utility. More details can be found in the &man.ddb.4; manual
- page. &merged;</para>
+ page.</para>
- <para>The kernel now supports a new textdump format of kernel
+ <para role="merged">The kernel now supports a new textdump format of kernel
dumps. A textdump provides higher-level information via
mechanically generated/extracted debugging output, rather than a
simple memory dump. This facility can be used to generate brief
kernel bug reports that are rich in debugging information, but
are not dependent on kernel symbol tables or precisely
synchronized source code. More information can be found in the
- &man.textdump.4; manual page. &merged;</para>
+ &man.textdump.4; manual page.</para>
<para>Kernel support for M:N threading has been removed. While
the KSE (Kernel Scheduled Entities) project was quite successful
@@ -181,39 +178,39 @@
interface for user applications to test the presence of
features.</para>
- <para>[&arch.amd64;] The &os; kernel now has support for large
+ <para arch="amd64">The &os; kernel now has support for large
memory page mappings (<quote>superpages</quote>).</para>
- <para>[&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE
+ <para arch="amd64,i386,ia64,powerpc" role="merged">The ULE
scheduler is now the default process scheduler
- in <filename>GENERIC</filename> kernels. &merged;</para>
+ in <filename>GENERIC</filename> kernels.</para>
<sect3 id="boot">
<title>Boot Loader Changes</title>
- <para>[&arch.amd64;, &arch.i386;] The BTX kernel used by the boot
+ <para arch="amd64,i386" role="merged">The BTX kernel used by the boot
loader has been changed to invoke BIOS routines from real
mode. This change makes it possible to boot &os; from USB
- devices. &merged;</para>
+ devices.</para>
- <para>[&arch.amd64;, &arch.i386;] A new gptboot boot loader has
+ <para arch="amd64,i386" role="merged">A new gptboot boot loader has
been added to support booting from a GPT labeled disk. A
new <command>boot</command> command has been added to
&man.gpt.8;, which makes a GPT disk bootable by writing the
required bits of the boot loader, creating a new boot
- partition if required. &merged;</para>
+ partition if required.</para>
</sect3>
<sect3 id="proc">
<title>Hardware Support</title>
- <para>The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
- PCMCIA smartcard readers, has been added. &merged;</para>
+ <para role="merged">The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
+ PCMCIA smartcard readers, has been added.</para>
- <para>The &man.uslcom.4; driver, a driver for Silicon
+ <para role="merged">The &man.uslcom.4; driver, a driver for Silicon
Laboratories CP2101/CP2102-based USB serial adapters, has been
- imported from OpenBSD. &merged;</para>
+ imported from OpenBSD.</para>
<sect4 id="mm">
<title>Multimedia Support</title>
@@ -250,9 +247,8 @@
number of outstanding issues. It also now works on all
architectures.</para>
- <para>[&arch.amd64;, &arch.i386;] The &man.wpi.4; driver has
- been updated to include a number of stability fixes.
- &merged;</para>
+ <para arch="amd64,i386" role="merged">The &man.wpi.4; driver has
+ been updated to include a number of stability fixes.</para>
</sect4>
</sect3>
@@ -267,16 +263,16 @@
the <varname>net.bpf.zerocopy_enable</varname> sysctl
variable to <literal>1</literal>.</para>
- <para>A bug in TCP options padding, where the wrong padding
- bytes were used, has been fixed. &merged;</para>
+ <para role="merged">A bug in TCP options padding, where the wrong padding
+ bytes were used, has been fixed.</para>
</sect3>
<sect3 id="disks">
<title>Disks and Storage</title>
- <para>The &man.aac.4; driver now supports volumes larger than
- 2TB in size. &merged;</para>
+ <para role="merged">The &man.aac.4; driver now supports volumes larger than
+ 2TB in size.</para>
<para>The &man.ata.4; driver now supports a spindown command for
disks; after a configurable amount of time, if no requests
@@ -285,8 +281,8 @@
supports a <command>spindown</command> command to configure
this feature.</para>
- <para>The &man.hptrr.4; driver has been updated to version 1.2
- from Highpoint. &merged;</para>
+ <para role="merged">The &man.hptrr.4; driver has been updated to version 1.2
+ from Highpoint.</para>
</sect3>
@@ -307,23 +303,31 @@
<sect2 id="userland">
<title>Userland Changes</title>
- <para>The &man.adduser.8; utility now supports
+ <para role="merged">The &man.adduser.8; utility now supports
a <option>-M</option> option to set the mode of a new user's
- home directory. &merged;</para>
+ home directory.</para>
<para>BSD-licensed versions of &man.ar.1; and &man.ranlib.1;,
based on <filename>libarchive</filename>, have replaced the GNU
Binutils versions of these utilities.</para>
- <para>&man.chflags.1; now supports a <option>-v</option> flag for
+ <para role="merged">&man.chflags.1; now supports a <option>-v</option> flag for
verbose output and a <option>-f</option> flag to ignore errors
with the same semantics as (for example)
- &man.chmod.1;. &merged;</para>
+ &man.chmod.1;.</para>
<para>For compatiblity with other implementations, &man.cp.1; now
supports a <option>-a</option> flag, which is equivalent to
specifying the <option>-RrP</option> flags.</para>
+ <para>The &man.env.1; program now supports <option>-u
+ <replaceable>name</replaceable></option>
+ which will completely unset the given variable
+ <replaceable>name</replaceable> by removing it from the environment,
+ instead of just setting it to a null value.</para>
+
+ <para>The &man.fdopendir.3; library function has been added.</para>
+
<para>&man.find.1; has been enhanced by the addition of a number
of primaries that were present in GNU find but not &os;
&man.find.1;.</para>
@@ -342,9 +346,9 @@
<para>The &man.procstat.1; utility has been added to display
detailed information about processes.</para>
- <para>The &man.realpath.1; utility now supports
+ <para role="merged">The &man.realpath.1; utility now supports
a <option>-q</option> flag to suppress warnings; it now also
- accepts multiple paths on its command line. &merged; </para>
+ accepts multiple paths on its command line.</para>
<para>The &man.split.1; utility now supports a <option>-n</option>
flag to split a file into a certain number of chunks.</para>
@@ -353,6 +357,11 @@
flag to enable &man.compress.1;-style
compression/decompression.</para>
+ <para>The &man.tcgetsid.3; library function has been added to
+ return the process group ID for the session leader for the
+ controlling terminal. It is defined in IEEE Std 1003.1-2001
+ (POSIX).</para>
+
<para>&man.top.1; now supports a <option>-P</option> flag to
provide per-CPU usage statistics.</para>
@@ -376,14 +385,14 @@
<sect2 id="contrib">
<title>Contributed Software</title>
- <para><application>AMD</application> has been updated from 6.0.10
- to 6.1.5. &merged;</para>
+ <para role="merged"><application>AMD</application> has been updated from 6.0.10
+ to 6.1.5.</para>
- <para><application>awk</application> has been updated from 1 May
- 2007 release to the 23 October 2007 release. &merged;</para>
+ <para role="merged"><application>awk</application> has been updated from 1 May
+ 2007 release to the 23 October 2007 release.</para>
- <para><application>bzip2</application> has been updated from 1.0.4
- to 1.0.5. &merged;</para>
+ <para role="merged"><application>bzip2</application> has been updated from 1.0.4
+ to 1.0.5.</para>
<para><application>CVS</application> has been updated from 1.11.17
to a post-1.11.22 snapshot from 10 March 2008.</para>
@@ -400,15 +409,15 @@
<para><application>ncurses</application> has been updated from
5.6-20061217 to 5.6-20080209.</para>
- <para><application>OpenPAM</application> has been updated from the
- Figwort release to the Hydrangea release. &merged;</para>
+ <para role="merged"><application>OpenPAM</application> has been updated from the
+ Figwort release to the Hydrangea release.</para>
- <para><application>sendmail</application> has been updated from
- 8.14.1 to 8.14.2. &merged;</para>
+ <para role="merged"><application>sendmail</application> has been updated from
+ 8.14.1 to 8.14.2.</para>
- <para>The timezone database has been updated from
+ <para role="merged">The timezone database has been updated from
the <application>tzdata2007h</application> release to
- the <application>tzdata2008b</application> release. &merged;</para>
+ the <application>tzdata2008b</application> release.</para>
<para><application>WPA Supplicant</application> has been
updated from 0.5.8 to 0.5.10.</para>
@@ -429,10 +438,10 @@
<sect2 id="releng">
<title>Release Engineering and Integration</title>
- <para>The supported version of
+ <para role="merged">The supported version of
the <application>GNOME</application> desktop environment
(<filename role="package">x11/gnome2</filename>) has been
- updated from 2.20.1 to 2.22. &merged;</para>
+ updated from 2.20.1 to 2.22.</para>
</sect2>
@@ -447,7 +456,7 @@
<sect1 id="upgrade">
<title>Upgrading from previous releases of &os;</title>
- <para>[&arch.i386;, &arch.amd64;] Beginning with &os; 6.2-RELEASE,
+ <para arch="amd64,i386">Beginning with &os; 6.2-RELEASE,
binary upgrades between RELEASE versions (and snapshots of the
various security branches) are supported using the
&man.freebsd-update.8; utility. The binary upgrade procedure will
==== //depot/projects/hammer/release/doc/share/sgml/release.dsl#6 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.10 2005/11/28 06:24:19 hrs Exp $ -->
+<!-- $FreeBSD: src/release/doc/share/sgml/release.dsl,v 1.12 2008/04/20 18:28:31 hrs Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY % output.html "IGNORE">
@@ -56,90 +56,34 @@
; Deal with conditional inclusion of text via entities.
(default
- (let* ((arch (attribute-string (normalize "arch")))
- (role (attribute-string (normalize "role")))
+ (let* ((role (attribute-string (normalize "role")))
(for-arch (entity-text "arch")))
(cond
- ; If role=historic, and we're not printing historic things, then
- ; don't output this element.
+ ;; If role=historic, and we're not printing historic things, then
+ ;; don't output this element.
((and (equal? role "historic")
- (not %include-historic%))
+ (not %include-historic%))
(empty-sosofo))
-
- ; If arch= not specified, then print unconditionally. This clause
- ; handles the majority of cases.
- ((or (equal? arch #f) (equal? arch ""))
- (next-match))
-
- ; arch= specified, see if it's equal to "all". If so, then
- ; print unconditionally. Note that this clause could be
- ; combined with the check to see if arch= wasn't specified
- ; or was empty; they have the same outcome.
- ((equal? arch "all")
- (next-match))
-
- ; arch= specified. If we're building for all architectures,
- ; then print it prepended with the set of architectures to which
- ; this element applies.
- ;
- ; XXX This doesn't work.
-; ((equal? for-arch "all")
-; (sosofo-append (literal "[") (literal arch) (literal "] ")
-; (process-children)))
-
- ; arch= specified, so we need to check to see if the specified
- ; parameter includes the architecture we're building for.
- ((string-list-match? for-arch (split-string-to-list arch))
- (next-match))
+ ;; None of the above
+ (else (next-match)))))
- ; None of the above
- (else (empty-sosofo)))))
-
(mode qandatoc
(default
- (let* ((arch (attribute-string (normalize "arch")))
- (role (attribute-string (normalize "role")))
- (for-arch (entity-text "arch")))
- (cond
+ (let* ((role (attribute-string (normalize "role")))
+ (for-arch (entity-text "arch")))
+ (cond
- ; If role=historic, and we're not printing historic things, then
- ; don't output this element.
- ((and (equal? role "historic")
- (not %include-historic%))
- (empty-sosofo))
-
+ ;; If role=historic, and we're not printing historic things, then
+ ;; don't output this element.
+ ((and (equal? role "historic")
+ (not %include-historic%))
+ (empty-sosofo))
- ; If arch= not specified, then print unconditionally. This clause
- ; handles the majority of cases.
- ((or (equal? arch #f) (equal? arch ""))
- (next-match))
+ ;; None of the above
+ (else (next-match))))))
- ; arch= specified, see if it's equal to "all". If so, then
- ; print unconditionally. Note that this clause could be
- ; combined with the check to see if arch= wasn't specified
- ; or was empty; they have the same outcome.
- ((equal? arch "all")
- (next-match))
-
- ; arch= specified. If we're building for all architectures,
- ; then print it prepended with the set of architectures to which
- ; this element applies.
- ;
- ; XXX This doesn't work.
-; ((equal? for-arch "all")
-; (sosofo-append (literal "[") (literal arch) (literal "] ")
-; (process-children)))
-
- ; arch= specified, so we need to check to see if the specified
- ; parameter includes the architecture we're building for.
- ((string-list-match? for-arch (split-string-to-list arch))
- (next-match))
-
- ; None of the above
- (else (empty-sosofo))))))
-
; We might have some sect1 level elements where the modification times
; are significant. An example of this is the "What's New" section in
; the release notes. We enable the printing of pubdate entry in
@@ -177,6 +121,55 @@
(("netbsd") (string-append u "&" "manpath=NetBSD+&release.manpath.netbsd;"))
(("ports") (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd-ports;"))
(else (string-append u "&" "manpath=FreeBSD+&release.manpath.freebsd;")))))
+
+ ;; $paragraph$ function with arch attribute support.
+ (define ($paragraph$ #!optional (para-wrapper "P"))
+ (let ((footnotes (select-elements (descendants (current-node))
+ (normalize "footnote")))
+ (tgroup (have-ancestor? (normalize "tgroup")))
+ (arch (attribute-string (normalize "arch")))
+ (role (attribute-string (normalize "role")))
+ (arch-string (entity-text "arch"))
+ (merged-string (entity-text "merged")))
+ (make sequence
+ (make element gi: para-wrapper
+ attributes: (append
+ (if %default-quadding%
+ (list (list "ALIGN" %default-quadding%))
+ '()))
+ (make sequence
+ (cond
+ ;; If arch= not specified, then print unconditionally. This clause
+ ;; handles the majority of cases.
+ ((or (equal? arch #f)
+ (equal? arch "")
+ (equal? arch "all"))
+ (process-children))
+ (else
+ (sosofo-append
+ (make sequence
+ (literal "[")
+ (let loop ((prev (car (split-string-to-list arch)))
+ (rest (cdr (split-string-to-list arch))))
+ (make sequence
+ (literal prev)
+ (if (not (null? rest))
+ (make sequence
+ (literal ", ")
+ (loop (car rest) (cdr rest)))
+ (empty-sosofo))))
+ (literal "] ")
+ (process-children)
+ (if (and (not (null? role)) (equal? role "merged"))
+ (literal " [" merged-string "]")
+ (empty-sosofo))))))
+ (if (or %footnotes-at-end% tgroup (node-list-empty? footnotes))
+ (empty-sosofo)
+ (make element gi: "BLOCKQUOTE"
+ attributes: (list
+ (list "CLASS" "FOOTNOTES"))
+ (with-mode footnote-mode
+ (process-node-list footnotes)))))))))
]]>
(define (toc-depth nd)
==== //depot/projects/hammer/release/doc/share/sgml/release.ent#24 (text+ko) ====
@@ -1,6 +1,6 @@
<!-- -*- sgml -*-
- $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.31 2007/11/30 05:01:23 bmah Exp $
+ $FreeBSD: src/release/doc/share/sgml/release.ent,v 1.32 2008/04/20 17:58:05 hrs Exp $
OS Release Information -->
@@ -59,3 +59,5 @@
<!ENTITY arch.sparc64 "sparc64">
<!ENTITY arch.sun4v "sun4v">
+<!-- The marker for MFCs. -->
+<!ENTITY merged "MERGED">
==== //depot/projects/hammer/sys/amd64/amd64/machdep.c#167 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.683 2008/03/16 10:58:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.684 2008/04/19 07:25:57 peter Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -849,11 +849,23 @@
#if !defined(DEV_ATPIC) && defined(DEV_ISA)
#include <isa/isavar.h>
-u_int
+#include <isa/isareg.h>
+/*
+ * Return a bitmap of the current interrupt requests. This is 8259-specific
+ * and is only suitable for use at probe time.
+ * This is only here to pacify sio. It is NOT FATAL if this doesn't work.
+ * It shouldn't be here. There should probably be an APIC centric
+ * implementation in the apic driver code, if at all.
+ */
+intrmask_t
isa_irq_pending(void)
{
+ u_char irr1;
+ u_char irr2;
- return (0);
+ irr1 = inb(IO_ICU1);
+ irr2 = inb(IO_ICU2);
+ return ((irr2 << 8) | irr1);
}
#endif
==== //depot/projects/hammer/sys/amd64/conf/GENERIC#107 (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.495 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.496 2008/04/20 19:20:36 sam Exp $
cpu HAMMER
ident GENERIC
@@ -245,7 +245,6 @@
device ath # Atheros pci/cardbus NIC's
device ath_hal # Atheros HAL (Hardware Access Layer)
device ath_rate_sample # SampleRate tx rate control for ath
-device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
==== //depot/projects/hammer/sys/conf/NOTES#143 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1479 2008/04/02 16:17:19 imp Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1480 2008/04/20 19:20:37 sam Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -707,7 +707,7 @@
# according to IEEE 802.1Q. It requires `device miibus'.
# The `wlan' device provides generic code to support 802.11
# drivers, including host AP mode; it is MANDATORY for the wi,
-# ath, and awi drivers and will eventually be required by all 802.11 drivers.
+# and ath drivers and will eventually be required by all 802.11 drivers.
# The `wlan_wep', `wlan_tkip', and `wlan_ccmp' devices provide
# support for WEP, TKIP, and AES-CCMP crypto protocols optionally
# used with 802.11 devices that depend on the `wlan' module.
@@ -1744,8 +1744,6 @@
# an: Aironet 4500/4800 802.11 wireless adapters. Supports the PCMCIA,
# PCI and ISA varieties.
-# awi: Support for IEEE 802.11 PC Card devices using the AMD Am79C930 and
-# Harris (Intersil) Chipset with PCnetMobile firmware by AMD.
# bce: Broadcom NetXtreme II (BCM5706/BCM5708) PCI/PCIe Gigabit Ethernet
# adapters.
# bfe: Broadcom BCM4401 Ethernet adapter.
@@ -1881,7 +1879,6 @@
hint.sn.0.port="0x300"
hint.sn.0.irq="10"
device an
-device awi
device cnw
device wi
device xe
==== //depot/projects/hammer/sys/conf/files#180 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1290 2008/04/16 17:24:18 rrs Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1292 2008/04/20 19:20:37 sam Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -486,9 +486,6 @@
compile-with "${NORMAL_C} -I$S/dev/ath"
dev/ath/if_ath_pci.c optional ath pci \
compile-with "${NORMAL_C} -I$S/dev/ath"
-dev/awi/am79c930.c optional awi
-dev/awi/awi.c optional awi
-dev/awi/if_awi_pccard.c optional awi pccard
dev/bce/if_bce.c optional bce
dev/bfe/if_bfe.c optional bfe
dev/bge/if_bge.c optional bge
@@ -518,7 +515,6 @@
dev/cs/if_cs_pccard.c optional cs pccard
dev/cxgb/cxgb_main.c optional cxgb pci
dev/cxgb/cxgb_offload.c optional cxgb pci
-dev/cxgb/cxgb_l2t.c optional cxgb pci
dev/cxgb/cxgb_lro.c optional cxgb pci
dev/cxgb/cxgb_sge.c optional cxgb pci
dev/cxgb/cxgb_multiq.c optional cxgb pci
==== //depot/projects/hammer/sys/conf/files.pc98#66 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.360 2008/04/13 06:18:34 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.361 2008/04/19 08:18:47 nyan Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -336,6 +336,7 @@
pc98/cbus/nmi.c standard
pc98/cbus/olpt.c optional olpt
pc98/cbus/pckbd.c optional pckbd
+pc98/cbus/pcrtc.c standard
pc98/cbus/pmc.c optional pmc
pc98/cbus/scgdcrndr.c optional sc gdc
pc98/cbus/scterm-sck.c optional sc
==== //depot/projects/hammer/sys/contrib/pf/net/pf.c#37 (text+ko) ====
@@ -40,7 +40,7 @@
#include "opt_inet6.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.52 2008/04/17 21:38:15 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/contrib/pf/net/pf.c,v 1.53 2008/04/20 00:21:54 rwatson Exp $");
#endif
#ifdef __FreeBSD__
@@ -2915,7 +2915,7 @@
pd->lookup.pid = NO_PID; /* XXX: revisit */
#ifdef __FreeBSD__
if (inp_arg != NULL) {
- INP_WLOCK_ASSERT(inp_arg);
+ INP_LOCK_ASSERT(inp_arg);
if (inp_arg->inp_socket) {
pd->lookup.uid = inp_arg->inp_socket->so_cred->cr_uid;
pd->lookup.gid =
@@ -3018,16 +3018,15 @@
return (-1);
}
#ifdef __FreeBSD__
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
+ INP_INFO_RUNLOCK(pi);
if ((inp->inp_socket == NULL) || (inp->inp_socket->so_cred == NULL)) {
- INP_WUNLOCK(inp);
- INP_INFO_RUNLOCK(pi);
+ INP_RUNLOCK(inp);
return (-1);
}
pd->lookup.uid = inp->inp_socket->so_cred->cr_uid;
pd->lookup.gid = inp->inp_socket->so_cred->cr_groups[0];
- INP_WUNLOCK(inp);
- INP_INFO_RUNLOCK(pi);
+ INP_RUNLOCK(inp);
#else
pd->lookup.uid = inp->inp_socket->so_euid;
pd->lookup.gid = inp->inp_socket->so_egid;
==== //depot/projects/hammer/sys/dev/ata/ata-all.c#68 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.286 2008/04/18 15:15:04 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-all.c,v 1.287 2008/04/20 17:45:32 bz Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -366,12 +366,13 @@
switch (cmd) {
case IOCATAGMAXCHANNEL:
+ /* In case we have channel 0..n this will return n+1. */
*value = devclass_get_maxunit(ata_devclass);
error = 0;
break;
case IOCATAREINIT:
- if (*value > devclass_get_maxunit(ata_devclass) ||
+ if (*value >= devclass_get_maxunit(ata_devclass) ||
!(device = devclass_get_device(ata_devclass, *value)))
return ENXIO;
error = ata_reinit(device);
@@ -379,7 +380,7 @@
break;
case IOCATAATTACH:
- if (*value > devclass_get_maxunit(ata_devclass) ||
+ if (*value >= devclass_get_maxunit(ata_devclass) ||
!(device = devclass_get_device(ata_devclass, *value)))
return ENXIO;
/* XXX SOS should enable channel HW on controller */
@@ -387,7 +388,7 @@
break;
case IOCATADETACH:
- if (*value > devclass_get_maxunit(ata_devclass) ||
+ if (*value >= devclass_get_maxunit(ata_devclass) ||
!(device = devclass_get_device(ata_devclass, *value)))
return ENXIO;
error = ata_detach(device);
@@ -395,7 +396,7 @@
break;
case IOCATADEVICES:
- if (devices->channel > devclass_get_maxunit(ata_devclass) ||
+ if (devices->channel >= devclass_get_maxunit(ata_devclass) ||
!(device = devclass_get_device(ata_devclass, devices->channel)))
return ENXIO;
bzero(devices->name[0], 32);
==== //depot/projects/hammer/sys/dev/cxgb/cxgb_main.c#19 (text+ko) ====
@@ -1,6 +1,6 @@
/**************************************************************************
-Copyright (c) 2007, Chelsio Inc.
+Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -9,7 +9,7 @@
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
-2. Neither the name of the Chelsio Corporation nor the names of its
+ 2. Neither the name of the Chelsio Corporation nor the names of its
contributors may be used to endorse or promote products derived from
this software without specific prior written permission.
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.53 2008/03/20 20:52:37 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_main.c,v 1.54 2008/04/19 03:22:41 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -723,9 +723,10 @@
printf("cxgb_free: DEVMAP_BIT not set\n");
} else
printf("not offloading set\n");
-
+#ifdef notyet
if (sc->flags & CXGB_OFLD_INIT)
cxgb_offload_deactivate(sc);
+#endif
free(sc->filters, M_DEVBUF);
t3_sge_free(sc);
@@ -1732,9 +1733,6 @@
t3_tp_set_offload_mode(adapter, 1);
tdev->lldev = pi->ifp;
- err = cxgb_offload_activate(adapter);
- if (err)
- goto out;
init_port_mtus(adapter);
t3_load_mtus(adapter, adapter->params.mtus, adapter->params.a_wnd,
@@ -1743,10 +1741,6 @@
adapter->port[0].ifp->if_mtu : 0xffff);
init_smt(adapter);
- /* Call back all registered clients */
- cxgb_add_clients(tdev);
-
-out:
/* restore them in case the offload module has changed them */
if (err) {
t3_tp_set_offload_mode(adapter, 0);
@@ -1764,8 +1758,6 @@
if (!isset(&adapter->open_device_map, OFFLOAD_DEVMAP_BIT))
return (0);
- /* Call back all registered clients */
- cxgb_remove_clients(tdev);
tdev->lldev = NULL;
cxgb_set_dummy_ops(tdev);
t3_tp_set_offload_mode(adapter, 0);
==== //depot/projects/hammer/sys/dev/cxgb/cxgb_offload.c#9 (text+ko) ====
@@ -31,7 +31,7 @@
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_offload.c,v 1.12 2008/02/23 06:19:16 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/cxgb_offload.c,v 1.14 2008/04/19 03:43:06 kmacy Exp $");
#include <sys/param.h>
#include <sys/systm.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon Apr 21 00:16:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 2A98D1065672; Mon, 21 Apr 2008 00:16:16 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 42EC3106566B
for <perforce@freebsd.org>; Mon, 21 Apr 2008 00:16:14 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 27DE28FC1B
for <perforce@freebsd.org>; Mon, 21 Apr 2008 00:16:14 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3L0GEQE003833
for <perforce@freebsd.org>; Mon, 21 Apr 2008 00:16:14 GMT
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3L0GCAh003823
for perforce@freebsd.org; Mon, 21 Apr 2008 00:16:12 GMT
(envelope-from marcel@freebsd.org)
Date: Mon, 21 Apr 2008 00:16:12 GMT
Message-Id: <200804210016.m3L0GCAh003823@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140338 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Apr 2008 00:16:16 -0000
http://perforce.freebsd.org/chv.cgi?CH=140338
Change 140338 by marcel@marcel_xcllnt on 2008/04/21 00:15:32
IFC @140337
Affected files ...
.. //depot/projects/powerpc/ObsoleteFiles.inc#20 integrate
.. //depot/projects/powerpc/UPDATING#19 integrate
.. //depot/projects/powerpc/contrib/hostapd/driver_wired.c#3 delete
.. //depot/projects/powerpc/etc/Makefile#6 integrate
.. //depot/projects/powerpc/etc/defaults/rc.conf#13 integrate
.. //depot/projects/powerpc/etc/network.subr#7 integrate
.. //depot/projects/powerpc/etc/rc.d/hostapd#3 integrate
.. //depot/projects/powerpc/etc/rc.d/netif#7 integrate
.. //depot/projects/powerpc/etc/rc.d/wpa_supplicant#3 integrate
.. //depot/projects/powerpc/etc/regdomain.xml#1 branch
.. //depot/projects/powerpc/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 integrate
.. //depot/projects/powerpc/include/stdio.h#5 integrate
.. //depot/projects/powerpc/lib/libc/stdio/_flock_stub.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/asprintf.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fgetwc.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fgetws.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/findfp.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fputwc.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fputws.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/freopen.c#4 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fseek.c#4 integrate
.. //depot/projects/powerpc/lib/libc/stdio/fwide.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/local.h#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/refill.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/snprintf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/sprintf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/sscanf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/ungetc.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/ungetwc.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vasprintf.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vfprintf.c#4 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vfwprintf.c#4 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vsnprintf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vsprintf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vsscanf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vswprintf.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdio/vswscanf.c#3 integrate
.. //depot/projects/powerpc/lib/libc/stdio/xprintf.c#2 integrate
.. //depot/projects/powerpc/lib/libc/stdlib/strfmon.c#3 integrate
.. //depot/projects/powerpc/lib/libc/sys/cpuset.2#2 integrate
.. //depot/projects/powerpc/lib/libc/sys/cpuset_getaffinity.2#2 integrate
.. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/relnotes/article.sgml#19 integrate
.. //depot/projects/powerpc/release/doc/share/sgml/release.dsl#2 integrate
.. //depot/projects/powerpc/release/doc/share/sgml/release.ent#6 integrate
.. //depot/projects/powerpc/sbin/ifconfig/Makefile#4 integrate
.. //depot/projects/powerpc/sbin/ifconfig/ifconfig.8#14 integrate
.. //depot/projects/powerpc/sbin/ifconfig/ifieee80211.c#8 integrate
.. //depot/projects/powerpc/sbin/ifconfig/ifmedia.c#6 integrate
.. //depot/projects/powerpc/sbin/ifconfig/regdomain.c#1 branch
.. //depot/projects/powerpc/sbin/ifconfig/regdomain.h#1 branch
.. //depot/projects/powerpc/share/man/man4/Makefile#21 integrate
.. //depot/projects/powerpc/share/man/man4/altq.4#6 integrate
.. //depot/projects/powerpc/share/man/man4/ath.4#5 integrate
.. //depot/projects/powerpc/share/man/man4/awi.4#4 delete
.. //depot/projects/powerpc/share/man/man4/cnw.4#2 integrate
.. //depot/projects/powerpc/share/man/man4/ipw.4#5 integrate
.. //depot/projects/powerpc/share/man/man4/iwi.4#5 integrate
.. //depot/projects/powerpc/share/man/man4/malo.4#2 integrate
.. //depot/projects/powerpc/share/man/man4/ral.4#4 integrate
.. //depot/projects/powerpc/share/man/man4/rum.4#4 integrate
.. //depot/projects/powerpc/share/man/man4/ural.4#6 integrate
.. //depot/projects/powerpc/share/man/man4/wi.4#6 integrate
.. //depot/projects/powerpc/share/man/man4/wlan.4#4 integrate
.. //depot/projects/powerpc/share/man/man4/wlan_acl.4#2 integrate
.. //depot/projects/powerpc/share/man/man4/wlan_amrr.4#3 integrate
.. //depot/projects/powerpc/share/man/man4/wlan_xauth.4#2 integrate
.. //depot/projects/powerpc/share/man/man4/wpi.4#3 integrate
.. //depot/projects/powerpc/share/man/man4/zyd.4#2 integrate
.. //depot/projects/powerpc/share/man/man5/Makefile#5 integrate
.. //depot/projects/powerpc/share/man/man5/regdomain.5#1 branch
.. //depot/projects/powerpc/sys/amd64/amd64/machdep.c#14 integrate
.. //depot/projects/powerpc/sys/amd64/conf/GENERIC#16 integrate
.. //depot/projects/powerpc/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/powerpc/sys/arm/arm/intr.c#9 integrate
.. //depot/projects/powerpc/sys/arm/at91/at91.c#5 integrate
.. //depot/projects/powerpc/sys/arm/conf/AVILA#9 integrate
.. //depot/projects/powerpc/sys/arm/conf/HL200#3 integrate
.. //depot/projects/powerpc/sys/arm/conf/KB920X#6 integrate
.. //depot/projects/powerpc/sys/arm/include/intr.h#4 integrate
.. //depot/projects/powerpc/sys/conf/NOTES#25 integrate
.. //depot/projects/powerpc/sys/conf/files#29 integrate
.. //depot/projects/powerpc/sys/conf/files.pc98#12 integrate
.. //depot/projects/powerpc/sys/conf/options#27 integrate
.. //depot/projects/powerpc/sys/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/powerpc/sys/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/powerpc/sys/contrib/pf/net/pf.c#8 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-all.c#11 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-all.h#14 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#12 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-disk.c#12 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-dma.c#10 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-lowlevel.c#6 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-pci.c#10 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-queue.c#6 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-raid.c#9 integrate
.. //depot/projects/powerpc/sys/dev/ata/atapi-cam.c#7 integrate
.. //depot/projects/powerpc/sys/dev/ata/atapi-cd.c#10 integrate
.. //depot/projects/powerpc/sys/dev/ata/atapi-fd.c#8 integrate
.. //depot/projects/powerpc/sys/dev/ata/atapi-tape.c#9 integrate
.. //depot/projects/powerpc/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/powerpc/sys/dev/ath/ah_osdep.h#3 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/amrr/amrr.c#5 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/amrr/amrr.h#2 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/onoe/onoe.c#5 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/onoe/onoe.h#3 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/sample/sample.c#6 integrate
.. //depot/projects/powerpc/sys/dev/ath/ath_rate/sample/sample.h#4 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_ath.c#14 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_ath_pci.c#6 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_athioctl.h#3 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_athrate.h#4 integrate
.. //depot/projects/powerpc/sys/dev/ath/if_athvar.h#6 integrate
.. //depot/projects/powerpc/sys/dev/awi/am79c930.c#4 delete
.. //depot/projects/powerpc/sys/dev/awi/am79c930reg.h#4 delete
.. //depot/projects/powerpc/sys/dev/awi/am79c930var.h#4 delete
.. //depot/projects/powerpc/sys/dev/awi/awi.c#7 delete
.. //depot/projects/powerpc/sys/dev/awi/awireg.h#4 delete
.. //depot/projects/powerpc/sys/dev/awi/awivar.h#6 delete
.. //depot/projects/powerpc/sys/dev/awi/if_awi_pccard.c#5 delete
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_l2t.c#6 delete
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_l2t.h#5 delete
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_main.c#16 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_offload.c#6 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/cxgb_offload.h#7 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#5 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#7 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate
.. //depot/projects/powerpc/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate
.. //depot/projects/powerpc/sys/dev/if_ndis/if_ndis.c#10 integrate
.. //depot/projects/powerpc/sys/dev/if_ndis/if_ndisvar.h#4 integrate
.. //depot/projects/powerpc/sys/dev/ipw/if_ipw.c#7 integrate
.. //depot/projects/powerpc/sys/dev/ipw/if_ipwvar.h#4 integrate
.. //depot/projects/powerpc/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/powerpc/sys/dev/iwi/if_iwi.c#7 integrate
.. //depot/projects/powerpc/sys/dev/iwi/if_iwivar.h#4 integrate
.. //depot/projects/powerpc/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/powerpc/sys/dev/malo/if_malo.h#2 integrate
.. //depot/projects/powerpc/sys/dev/ral/if_ral_pci.c#4 integrate
.. //depot/projects/powerpc/sys/dev/ral/if_ralrate.c#2 delete
.. //depot/projects/powerpc/sys/dev/ral/if_ralrate.h#2 delete
.. //depot/projects/powerpc/sys/dev/ral/rt2560.c#9 integrate
.. //depot/projects/powerpc/sys/dev/ral/rt2560reg.h#4 integrate
.. //depot/projects/powerpc/sys/dev/ral/rt2560var.h#5 integrate
.. //depot/projects/powerpc/sys/dev/ral/rt2661.c#8 integrate
.. //depot/projects/powerpc/sys/dev/ral/rt2661_ucode.h#2 delete
.. //depot/projects/powerpc/sys/dev/ral/rt2661var.h#4 integrate
.. //depot/projects/powerpc/sys/dev/sound/pci/hda/hdac.c#16 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_rum.c#7 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_rumvar.h#3 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_ural.c#10 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_uralvar.h#4 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_zyd.c#5 integrate
.. //depot/projects/powerpc/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/powerpc/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/powerpc/sys/dev/usb/usbdevs#22 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wavelan_ieee.h#5 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wi.c#11 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wi_pccard.c#3 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wi_pci.c#3 integrate
.. //depot/projects/powerpc/sys/dev/wi/if_wivar.h#5 integrate
.. //depot/projects/powerpc/sys/dev/wi/spectrum24t_cf.h#2 delete
.. //depot/projects/powerpc/sys/dev/wpi/if_wpi.c#6 integrate
.. //depot/projects/powerpc/sys/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/powerpc/sys/i386/conf/GENERIC#18 integrate
.. //depot/projects/powerpc/sys/i386/conf/PAE#6 integrate
.. //depot/projects/powerpc/sys/i386/include/cpufunc.h#5 integrate
.. //depot/projects/powerpc/sys/ia64/ia64/mp_machdep.c#7 integrate
.. //depot/projects/powerpc/sys/ia64/ia64/pmap.c#15 integrate
.. //depot/projects/powerpc/sys/ia64/include/vmparam.h#10 integrate
.. //depot/projects/powerpc/sys/kern/kern_intr.c#17 integrate
.. //depot/projects/powerpc/sys/kern/kern_linker.c#12 integrate
.. //depot/projects/powerpc/sys/kern/kern_subr.c#7 integrate
.. //depot/projects/powerpc/sys/kern/kern_switch.c#14 integrate
.. //depot/projects/powerpc/sys/kern/kern_synch.c#16 integrate
.. //depot/projects/powerpc/sys/kern/kern_thread.c#16 integrate
.. //depot/projects/powerpc/sys/kern/sched_4bsd.c#16 integrate
.. //depot/projects/powerpc/sys/kern/sched_ule.c#19 integrate
.. //depot/projects/powerpc/sys/kern/subr_sleepqueue.c#12 integrate
.. //depot/projects/powerpc/sys/kern/subr_trap.c#13 integrate
.. //depot/projects/powerpc/sys/kern/subr_turnstile.c#8 integrate
.. //depot/projects/powerpc/sys/kern/subr_witness.c#22 integrate
.. //depot/projects/powerpc/sys/mips/conf/IDT#2 integrate
.. //depot/projects/powerpc/sys/modules/Makefile#21 integrate
.. //depot/projects/powerpc/sys/modules/ath_rate_amrr/Makefile#3 integrate
.. //depot/projects/powerpc/sys/modules/ath_rate_onoe/Makefile#3 integrate
.. //depot/projects/powerpc/sys/modules/ath_rate_sample/Makefile#3 integrate
.. //depot/projects/powerpc/sys/modules/awi/Makefile#3 delete
.. //depot/projects/powerpc/sys/modules/cxgb/cxgb/Makefile#6 integrate
.. //depot/projects/powerpc/sys/modules/cxgb/tom/Makefile#4 integrate
.. //depot/projects/powerpc/sys/modules/firmware/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/malo/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/ral/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/ralfw/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/ralfw/Makefile.inc#1 branch
.. //depot/projects/powerpc/sys/modules/ralfw/rt2561/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/ralfw/rt2561s/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/ralfw/rt2661/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/wlan/Makefile#3 integrate
.. //depot/projects/powerpc/sys/modules/wlan_acl/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_amrr/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_ccmp/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_rssadapt/Makefile#1 branch
.. //depot/projects/powerpc/sys/modules/wlan_scan_ap/Makefile#2 delete
.. //depot/projects/powerpc/sys/modules/wlan_scan_sta/Makefile#2 delete
.. //depot/projects/powerpc/sys/modules/wlan_tkip/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_wep/Makefile#2 integrate
.. //depot/projects/powerpc/sys/modules/wlan_xauth/Makefile#2 integrate
.. //depot/projects/powerpc/sys/net/if.c#15 integrate
.. //depot/projects/powerpc/sys/net/if_media.h#8 integrate
.. //depot/projects/powerpc/sys/net80211/_ieee80211.h#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211.c#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211.h#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_acl.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_adhoc.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_adhoc.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_amrr.c#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_amrr.h#2 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto.c#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto.h#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_ccmp.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_none.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_tkip.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_crypto_wep.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_ddb.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_dfs.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_dfs.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_freebsd.c#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_freebsd.h#6 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_hostap.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_hostap.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_ht.c#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_ht.h#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_input.c#8 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_input.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_ioctl.c#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_ioctl.h#4 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_monitor.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_monitor.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_node.c#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_node.h#5 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_output.c#8 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_phy.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_phy.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_power.h#2 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_proto.c#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_proto.h#6 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_regdomain.h#2 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_rssadapt.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_rssadapt.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_scan_ap.c#3 delete
.. //depot/projects/powerpc/sys/net80211/ieee80211_scan_sta.c#6 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_sta.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_sta.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_var.h#7 integrate
.. //depot/projects/powerpc/sys/net80211/ieee80211_wds.c#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_wds.h#1 branch
.. //depot/projects/powerpc/sys/net80211/ieee80211_xauth.c#3 integrate
.. //depot/projects/powerpc/sys/netgraph/ng_base.c#19 integrate
.. //depot/projects/powerpc/sys/netinet/in.h#10 integrate
.. //depot/projects/powerpc/sys/netinet/in_mcast.c#3 integrate
.. //depot/projects/powerpc/sys/netinet/in_pcb.c#16 integrate
.. //depot/projects/powerpc/sys/netinet/in_pcb.h#13 integrate
.. //depot/projects/powerpc/sys/netinet/ip_divert.c#9 integrate
.. //depot/projects/powerpc/sys/netinet/ip_fw2.c#17 integrate
.. //depot/projects/powerpc/sys/netinet/ip_icmp.c#9 integrate
.. //depot/projects/powerpc/sys/netinet/ip_options.c#5 integrate
.. //depot/projects/powerpc/sys/netinet/ip_output.c#13 integrate
.. //depot/projects/powerpc/sys/netinet/raw_ip.c#10 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_input.c#17 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_offload.h#3 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_output.c#15 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_reass.c#3 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_sack.c#5 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_subr.c#16 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_syncache.c#17 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_timer.c#10 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_timewait.c#4 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_usrreq.c#16 integrate
.. //depot/projects/powerpc/sys/netinet/tcp_var.h#17 integrate
.. //depot/projects/powerpc/sys/netinet/udp_usrreq.c#12 integrate
.. //depot/projects/powerpc/sys/netinet6/icmp6.c#12 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_pcb.c#11 integrate
.. //depot/projects/powerpc/sys/netinet6/in6_src.c#13 integrate
.. //depot/projects/powerpc/sys/netinet6/raw_ip6.c#11 integrate
.. //depot/projects/powerpc/sys/netinet6/udp6_usrreq.c#13 integrate
.. //depot/projects/powerpc/sys/pc98/cbus/clock.c#8 integrate
.. //depot/projects/powerpc/sys/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/powerpc/sys/pc98/conf/GENERIC#14 integrate
.. //depot/projects/powerpc/sys/pc98/include/clock.h#3 integrate
.. //depot/projects/powerpc/sys/security/audit/audit_arg.c#10 integrate
.. //depot/projects/powerpc/sys/security/mac/mac_inet.c#7 integrate
.. //depot/projects/powerpc/sys/sparc64/conf/GENERIC#15 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/apb.c#4 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pci_if.m#4 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pcib.c#3 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pcib_subr.c#3 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/ofw_pcibus.c#7 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/psycho.c#10 integrate
.. //depot/projects/powerpc/sys/sparc64/pci/psychovar.h#6 integrate
.. //depot/projects/powerpc/sys/sys/param.h#20 integrate
.. //depot/projects/powerpc/sys/sys/proc.h#24 integrate
.. //depot/projects/powerpc/sys/sys/sched.h#7 integrate
.. //depot/projects/powerpc/sys/sys/sysctl.h#12 integrate
.. //depot/projects/powerpc/sys/sys/termios.h#4 integrate
.. //depot/projects/powerpc/sys/vm/vm_glue.c#13 integrate
.. //depot/projects/powerpc/sys/vm/vm_zeroidle.c#12 integrate
.. //depot/projects/powerpc/tools/tools/net80211/Makefile#3 integrate
.. //depot/projects/powerpc/tools/tools/net80211/scripts/config#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.dfs#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.fixed#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.local#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.mixed#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.simple#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.simple2#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.sta#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.tsn#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.updown#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.updown.wpa#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wds#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wdsmain#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wdsrelay#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wep#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa1.aes#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa1.tkip#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa2#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/scripts/setup.wpa2.tkip#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/wlanstats/main.c#4 integrate
.. //depot/projects/powerpc/tools/tools/net80211/wlanstats/wlanstats.c#5 integrate
.. //depot/projects/powerpc/tools/tools/net80211/wlanwds/Makefile#1 branch
.. //depot/projects/powerpc/tools/tools/net80211/wlanwds/wlanwds.c#1 branch
.. //depot/projects/powerpc/usr.bin/env/env.1#2 integrate
.. //depot/projects/powerpc/usr.bin/env/env.c#4 integrate
.. //depot/projects/powerpc/usr.bin/procstat/procstat.1#2 integrate
.. //depot/projects/powerpc/usr.sbin/wlandebug/wlandebug.c#2 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/hostapd/Makefile#4 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/hostapd/driver_freebsd.c#3 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/wpa_supplicant/Packet32.c#3 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#5 integrate
.. //depot/projects/powerpc/usr.sbin/wpa/wpa_supplicant/driver_wired.c#1 branch
Differences ...
==== //depot/projects/powerpc/ObsoleteFiles.inc#20 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.137 2008/04/20 16:03:19 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -19,6 +19,22 @@
OLD_FILES+=usr/sbin/pkg_sign
OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
+# 20080325: tzdata2008b import
+OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
+OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
+# 20080314: stack_print(9) mlink fixed
+OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
+# 20080312: libkse removal
+OLD_FILES+=usr/include/sys/kse.h
+OLD_FILES+=usr/lib/libkse.so
+OLD_LIBS+=usr/lib/libkse.so.3
+OLD_FILES+=usr/share/man/man2/kse.2.gz
+OLD_FILES+=usr/share/man/man2/kse_create.2.gz
+OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
+OLD_FILES+=usr/share/man/man2/kse_release.2.gz
+OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
+OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
+OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
==== //depot/projects/powerpc/UPDATING#19 (text+ko) ====
@@ -22,6 +22,16 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080420:
+ The 802.11 wireless support was redone to enable multi-bss
+ operation on devices that are capable. The underlying device
+ is no longer used directly but instead wlanX devices are
+ cloned with ifconfig. This requires changes to rc.conf files.
+
+ As part of the multi-bss changes the wlan_scan_ap and wlan_scan_sta
+ modules were merged into the base wlan module. All references
+ to these modules (e.g. in kernel config files) must be removed.
+
20080408:
psm(4) has gained write(2) support in native operation level.
Arbitrary commands can be written to /dev/psm%d and status can
@@ -1014,4 +1024,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $
+$FreeBSD: src/UPDATING,v 1.525 2008/04/20 21:25:37 sam Exp $
==== //depot/projects/powerpc/etc/Makefile#6 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $
+# $FreeBSD: src/etc/Makefile,v 1.367 2008/04/20 20:37:02 sam Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@
portsnap.conf pf.os phones profile protocols \
rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
rc.sendmail rc.shutdown \
- rc.subr remote rpc services shells \
+ rc.subr regdomain.xml remote rpc services shells \
snmpd.config sysctl.conf syslog.conf \
etc.${MACHINE_ARCH}/ttys \
${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
==== //depot/projects/powerpc/etc/defaults/rc.conf#13 (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.330 2008/04/08 23:50:03 emax Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.331 2008/04/20 20:37:20 sam Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -184,6 +184,7 @@
#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
#ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry.
#ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0.
+#vaps_ath0="wlan0" # VAP interfaces for ath0 device
#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
==== //depot/projects/powerpc/etc/network.subr#7 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.182 2008/03/28 06:50:06 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.183 2008/04/20 20:37:20 sam Exp $
#
#
@@ -30,6 +30,56 @@
# Requires that rc.conf be loaded first.
#
+# ifn_start ifn
+# Bring up and configure an interface. If some configuration is applied
+# print the interface configuration.
+#
+ifn_start()
+{
+ local ifn cfg
+ ifn="$1"
+ cfg=1
+
+ [ -z "$ifn" ] && err 1 "ifn_start called without an interface"
+
+ ifscript_up ${ifn} && cfg=0
+ ifconfig_up ${ifn} && cfg=0
+ ipv4_up ${ifn} && cfg=0
+ ipx_up ${ifn} && cfg=0
+ childif_create ${ifn} && cfg=0
+
+ if [ "$cfg" -eq 0 ]; then
+ ifconfig ${ifn}
+ fi
+
+ return $cfg
+}
+
+# ifn_start ifn
+# Shutdown and de-configure an interface. If action is taken print the
+# interface name.
+#
+ifn_stop()
+{
+ local ifn cfg
+ ifn="$1"
+ cfg=1
+
+ [ -z "$ifn" ] && return 1
+
+ ipx_down ${ifn} && cfg=0
+ ipv4_down ${ifn} && cfg=0
+ ifconfig_down ${ifn} && cfg=0
+ ifscript_down ${ifn} && cfg=0
+ childif_destroy ${ifn} && cfg=0
+
+ if [ "$cfg" -eq 0 ]; then
+ echo -n " ${ifn}"
+ fi
+
+ return $cfg
+}
+
# ifconfig_up if
# Evaluate ifconfig(8) arguments for interface $if and
# run ifconfig(8) with those arguments. It returns 0 if
@@ -43,8 +93,8 @@
ifconfig_args=`ifconfig_getargs $1`
if [ -n "${ifconfig_args}" ]; then
+ ifconfig $1 ${ifconfig_args}
ifconfig $1 up
- ifconfig $1 ${ifconfig_args}
_cfg=0
fi
@@ -452,6 +502,44 @@
debug "Destroyed clones: ${_list}"
}
+# Create and configure child interfaces.
+# Return 0 if child interfaces are created.
+#
+childif_create()
+{
+ local cfg child child_vaps create_args ifn i
+ cfg=1
+
+ ifn=$1
+
+ # Create VAPs
+ child_vaps=`get_if_var $ifn vaps_IF`
+ for child in ${child_vaps}; do
+ create_args="wlandev $ifn `get_if_var $child vap_create_IF`"
+ if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then
+ ifconfig $child create ${create_args} && cfg=0
+ else
+ i=`ifconfig wlan create ${create_args}`
+ ifconfig $i name $child && cfg=0
+ fi
+ ifn_start $child
+ done
+
+ return
+}
+
+# Destroy child interfaces.
+#
+childif_destroy()
+{
+ local cfg child child_vaps ifn
+
+ child_vaps=`get_if_var $ifn vaps_IF`
+ for child in ${child_vaps}; do
+ ifconfig $child destroy && cfg=0
+ done
+}
+
# Create netgraph nodes.
#
ng_mkpeer() {
==== //depot/projects/powerpc/etc/rc.d/hostapd#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/hostapd,v 1.2 2007/11/14 21:19:15 brix Exp $
+# $FreeBSD: src/etc/rc.d/hostapd,v 1.3 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: hostapd
@@ -18,6 +18,7 @@
command_args="-P ${pidfile} -B ${conf_file}"
required_files="${conf_file}"
+required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp"
extra_commands="reload"
load_rc_config ${name}
==== //depot/projects/powerpc/etc/rc.d/netif#7 (text+ko) ====
@@ -22,7 +22,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/netif,v 1.25 2008/01/26 11:22:12 mtm Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.26 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: netif
@@ -68,7 +68,7 @@
fi
# Configure the interface(s).
- network_common ifn_start verbose
+ network_common ifn_start
if [ -f /etc/rc.d/ipfilter ] ; then
# Resync ipfilter
@@ -92,34 +92,31 @@
echo '.'
}
-# network_common routine verbose
+# network_common routine
# Common configuration subroutine for network interfaces. This
# routine takes all the preparatory steps needed for configuriing
-# an interface and then calls $routine. If $verbose is specified,
-# it will call ifconfig(8) to show, in long format, the configured
-# interfaces. If $verbose is not given, it will simply output the
-# configured interface(s).
+# an interface and then calls $routine.
network_common()
{
- local _cooked_list _fail _func _verbose
+ local _cooked_list _fail _func
_func=
- _verbose=
if [ -z "$1" ]; then
err 1 "network_common(): No function name specified."
else
_func="$1"
fi
- [ -n "$2" ] && _verbose=yes
# Set the scope of the command (all interfaces or just one).
#
_cooked_list=
if [ -n "$cmdifn" ]; then
- # Don't check that the interfaces exist. We need to run
+ # Don't check that the interface(s) exist. We need to run
# the down code even when the interface doesn't exist to
# kill off wpa_supplicant.
+ # XXXBED: is this really true or does wpa_supplicant die?
+ # if so, we should get rid of the devd entry
_cooked_list="$cmdifn"
else
_cooked_list="`list_net_interfaces`"
@@ -127,59 +124,13 @@
_fail=
for ifn in ${_cooked_list}; do
- if ${_func} ${ifn} ; then
- eval showstat_$ifn=1
- else
- _fail="$_fail $ifn"
+ if ! ${_func} ${ifn} $2; then
+ _fail="${_fail} ${ifn}"
fi
done
- # Display interfaces configured by this script
- #
- for ifn in ${_cooked_list}; do
- eval showstat=\$showstat_${ifn}
- if [ ! -z ${showstat} ]; then
- if [ -n "$_verbose" ]; then
- ifconfig ${ifn}
- else
- echo -n " ${ifn}"
- fi
- fi
- done
debug "The following interfaces were not configured: $_fail"
}
-ifn_start()
-{
- local ifn cfg
- ifn="$1"
- cfg=1
-
- [ -z "$ifn" ] && return 1
-
- ifscript_up ${ifn} && cfg=0
- ifconfig_up ${ifn} && cfg=0
- ipv4_up ${ifn} && cfg=0
- ipx_up ${ifn} && cfg=0
-
- return $cfg
-}
-
-ifn_stop()
-{
- local ifn cfg
- ifn="$1"
- cfg=1
-
- [ -z "$ifn" ] && return 1
-
- ipx_down ${ifn} && cfg=0
- ipv4_down ${ifn} && cfg=0
- ifconfig_down ${ifn} && cfg=0
- ifscript_down ${ifn} && cfg=0
-
- return $cfg
-}
-
load_rc_config $name
run_rc_command $*
==== //depot/projects/powerpc/etc/rc.d/wpa_supplicant#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $
+# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.6 2008/04/20 20:37:21 sam Exp $
#
# PROVIDE: wpa_supplicant
@@ -30,18 +30,21 @@
test "$media" = "Ethernet"
}
-case ${ifn} in
-ndis*)
+is_ndis_interface()
+{
+ case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in
+ ndis*) true ;;
+ *) false ;;
+ esac
+}
+
+if is_wired_interface ${ifn} ; then
+ driver="wired"
+elif is_ndis_interface ${ifn} ; then
driver="ndis"
- ;;
-*)
- if is_wired_interface ${ifn} ; then
- driver="wired"
- else
- driver="bsd"
- fi
- ;;
-esac
+else
+ driver="bsd"
+fi
load_rc_config $name
@@ -50,5 +53,6 @@
pidfile="/var/run/${name}/${ifn}.pid"
command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
required_files=$conf_file
+required_modules="wlan_wep wlan_tkip wlan_ccmp"
run_rc_command "$1"
==== //depot/projects/powerpc/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 (text+ko) ====
@@ -1,12 +1,19 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.17 2004/07/08 17:05:32 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/libbfd/Makefile.i386,v 1.18 2008/04/17 23:36:35 marcel Exp $
DEFAULT_VECTOR= bfd_elf32_i386_freebsd_vec
-SRCS+= cpu-i386.c \
+SRCS+= cofflink.c \
+ cpu-i386.c \
+ efi-app-ia32.c \
elf32-i386.c \
elf32-target.h \
elf32.c \
- elflink.c
+ elflink.c \
+ peigen.c
VECS= ${DEFAULT_VECTOR} \
- bfd_elf32_i386_vec
+ bfd_elf32_i386_vec \
+ bfd_efi_app_ia32_vec
+
+peigen.c: peXXigen.c
+ sed -e s/XX/pe/g ${.ALLSRC} > ${.TARGET}
==== //depot/projects/powerpc/include/stdio.h#5 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)stdio.h 8.5 (Berkeley) 4/29/95
- * $FreeBSD: src/include/stdio.h,v 1.62 2008/03/31 12:14:04 kib Exp $
+ * $FreeBSD: src/include/stdio.h,v 1.64 2008/04/17 22:17:53 jhb Exp $
*/
#ifndef _STDIO_H_
@@ -72,9 +72,6 @@
int _size;
};
-/* hold a buncha junk that would grow the ABI */
-struct __sFILEX;
-
/*
* stdio state variables.
*
@@ -98,15 +95,19 @@
* that does not match the previous one in _bf. When this happens,
* _ub._base becomes non-nil (i.e., a stream has ungetc() data iff
* _ub._base!=NULL) and _up and _ur save the current values of _p and _r.
+ *
+ * Certain members of __sFILE are accessed directly via macros or
+ * inline functions. To preserve ABI compat, these members must not
+ * be disturbed. These members are marked below with (*).
*/
typedef struct __sFILE {
- unsigned char *_p; /* current position in (some) buffer */
- int _r; /* read space left for getc() */
- int _w; /* write space left for putc() */
- short _flags; /* flags, below; this FILE is free if 0 */
- short _file; /* fileno, if Unix descriptor, else -1 */
+ unsigned char *_p; /* (*) current position in (some) buffer */
+ int _r; /* (*) read space left for getc() */
+ int _w; /* (*) write space left for putc() */
+ short _flags; /* (*) flags, below; this FILE is free if 0 */
+ short _file; /* (*) fileno, if Unix descriptor, else -1 */
struct __sbuf _bf; /* the buffer (at least 1 byte, if !NULL) */
- int _lbfsize; /* 0 or -_bf._size, for inline putc */
+ int _lbfsize; /* (*) 0 or -_bf._size, for inline putc */
/* operations */
void *_cookie; /* cookie passed to io functions */
@@ -117,7 +118,7 @@
/* separate buffer for long sequences of ungetc() */
struct __sbuf _ub; /* ungetc buffer */
- struct __sFILEX *_extra; /* additions to FILE to not break ABI */
+ unsigned char *_up; /* saved _p when _p is doing ungetc data */
int _ur; /* saved _r when _r is counting ungetc data */
/* tricks to meet minimum requirements even when malloc() fails */
@@ -130,6 +131,12 @@
/* Unix stdio files get aligned to block boundaries on fseek() */
int _blksize; /* stat.st_blksize (may be != _bf._size) */
fpos_t _offset; /* current lseek offset */
+
+ struct pthread_mutex *_fl_mutex; /* used for MT-safety */
+ struct pthread *_fl_owner; /* current owner */
+ int _fl_count; /* recursive lock count */
+ int _orientation; /* orientation for fwide() */
+ __mbstate_t _mbstate; /* multibyte conversion state */
} FILE;
#ifndef _STDSTREAM_DECLARED
==== //depot/projects/powerpc/lib/libc/stdio/_flock_stub.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.15 2007/01/12 07:31:30 imp Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/_flock_stub.c,v 1.16 2008/04/17 22:17:53 jhb Exp $");
#include "namespace.h"
#include <stdio.h>
@@ -55,31 +55,21 @@
__weak_reference(_ftrylockfile, ftrylockfile);
__weak_reference(_funlockfile, funlockfile);
-/*
- * We need to retain binary compatibility for a while. So pretend
- * that _lock is part of FILE * even though it is dereferenced off
- * _extra now. When we stop encoding the size of FILE into binaries
- * this can be changed in stdio.h. This will reduce the amount of
- * code that has to change in the future (just remove this comment
- * and #define).
- */
-#define _lock _extra
-
void
_flockfile(FILE *fp)
{
pthread_t curthread = _pthread_self();
- if (fp->_lock->fl_owner == curthread)
- fp->_lock->fl_count++;
+ if (fp->_fl_owner == curthread)
+ fp->_fl_count++;
else {
/*
* Make sure this mutex is treated as a private
* internal mutex:
*/
- _pthread_mutex_lock(&fp->_lock->fl_mutex);
- fp->_lock->fl_owner = curthread;
- fp->_lock->fl_count = 1;
+ _pthread_mutex_lock(&fp->_fl_mutex);
+ fp->_fl_owner = curthread;
+ fp->_fl_count = 1;
}
}
@@ -98,15 +88,15 @@
pthread_t curthread = _pthread_self();
int ret = 0;
- if (fp->_lock->fl_owner == curthread)
- fp->_lock->fl_count++;
+ if (fp->_fl_owner == curthread)
+ fp->_fl_count++;
/*
* Make sure this mutex is treated as a private
* internal mutex:
*/
- else if (_pthread_mutex_trylock(&fp->_lock->fl_mutex) == 0) {
- fp->_lock->fl_owner = curthread;
- fp->_lock->fl_count = 1;
+ else if (_pthread_mutex_trylock(&fp->_fl_mutex) == 0) {
+ fp->_fl_owner = curthread;
+ fp->_fl_count = 1;
}
else
ret = -1;
@@ -121,26 +111,26 @@
/*
* Check if this file is owned by the current thread:
*/
- if (fp->_lock->fl_owner == curthread) {
+ if (fp->_fl_owner == curthread) {
/*
* Check if this thread has locked the FILE
* more than once:
*/
- if (fp->_lock->fl_count > 1)
+ if (fp->_fl_count > 1)
/*
* Decrement the count of the number of
* times the running thread has locked this
* file:
*/
- fp->_lock->fl_count--;
+ fp->_fl_count--;
else {
/*
* The running thread will release the
* lock now:
*/
- fp->_lock->fl_count = 0;
- fp->_lock->fl_owner = NULL;
- _pthread_mutex_unlock(&fp->_lock->fl_mutex);
+ fp->_fl_count = 0;
+ fp->_fl_owner = NULL;
+ _pthread_mutex_unlock(&fp->_fl_mutex);
}
}
}
==== //depot/projects/powerpc/lib/libc/stdio/asprintf.c#2 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.13 2002/09/26 13:09:48 tjr Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/asprintf.c,v 1.14 2008/04/17 22:17:53 jhb Exp $");
#include <stdio.h>
#include <stdlib.h>
@@ -43,7 +43,6 @@
int ret;
va_list ap;
FILE f;
- struct __sFILEX ext;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon Apr 21 00:19:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CB8D61065674; Mon, 21 Apr 2008 00:19:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 74D85106564A
for <perforce@freebsd.org>; Mon, 21 Apr 2008 00:19:19 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 59BA58FC15
for <perforce@freebsd.org>; Mon, 21 Apr 2008 00:19:19 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3L0JJI6004025
for <perforce@freebsd.org>; Mon, 21 Apr 2008 00:19:19 GMT
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3L0JIlr004023
for perforce@freebsd.org; Mon, 21 Apr 2008 00:19:18 GMT
(envelope-from marcel@freebsd.org)
Date: Mon, 21 Apr 2008 00:19:18 GMT
Message-Id: <200804210019.m3L0JIlr004023@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140339 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Apr 2008 00:19:20 -0000
http://perforce.freebsd.org/chv.cgi?CH=140339
Change 140339 by marcel@marcel_xcllnt on 2008/04/21 00:18:51
IFC @140337
Affected files ...
.. //depot/projects/ia64/ObsoleteFiles.inc#25 integrate
.. //depot/projects/ia64/UPDATING#103 integrate
.. //depot/projects/ia64/contrib/hostapd/driver_wired.c#4 delete
.. //depot/projects/ia64/etc/Makefile#60 integrate
.. //depot/projects/ia64/etc/defaults/rc.conf#82 integrate
.. //depot/projects/ia64/etc/network.subr#23 integrate
.. //depot/projects/ia64/etc/rc.d/hostapd#3 integrate
.. //depot/projects/ia64/etc/rc.d/netif#19 integrate
.. //depot/projects/ia64/etc/rc.d/wpa_supplicant#4 integrate
.. //depot/projects/ia64/etc/regdomain.xml#1 branch
.. //depot/projects/ia64/lib/libc/stdlib/strfmon.c#12 integrate
.. //depot/projects/ia64/lib/libc/sys/cpuset.2#2 integrate
.. //depot/projects/ia64/lib/libc/sys/cpuset_getaffinity.2#2 integrate
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate
.. //depot/projects/ia64/release/doc/share/sgml/release.dsl#9 integrate
.. //depot/projects/ia64/release/doc/share/sgml/release.ent#25 integrate
.. //depot/projects/ia64/sbin/ifconfig/Makefile#13 integrate
.. //depot/projects/ia64/sbin/ifconfig/ifconfig.8#51 integrate
.. //depot/projects/ia64/sbin/ifconfig/ifieee80211.c#23 integrate
.. //depot/projects/ia64/sbin/ifconfig/ifmedia.c#16 integrate
.. //depot/projects/ia64/sbin/ifconfig/regdomain.c#1 branch
.. //depot/projects/ia64/sbin/ifconfig/regdomain.h#1 branch
.. //depot/projects/ia64/share/man/man4/Makefile#108 integrate
.. //depot/projects/ia64/share/man/man4/altq.4#15 integrate
.. //depot/projects/ia64/share/man/man4/ath.4#33 integrate
.. //depot/projects/ia64/share/man/man4/awi.4#12 delete
.. //depot/projects/ia64/share/man/man4/cnw.4#3 integrate
.. //depot/projects/ia64/share/man/man4/ipw.4#11 integrate
.. //depot/projects/ia64/share/man/man4/iwi.4#13 integrate
.. //depot/projects/ia64/share/man/man4/malo.4#2 integrate
.. //depot/projects/ia64/share/man/man4/ral.4#9 integrate
.. //depot/projects/ia64/share/man/man4/rum.4#4 integrate
.. //depot/projects/ia64/share/man/man4/ural.4#11 integrate
.. //depot/projects/ia64/share/man/man4/wi.4#44 integrate
.. //depot/projects/ia64/share/man/man4/wlan.4#11 integrate
.. //depot/projects/ia64/share/man/man4/wlan_acl.4#3 integrate
.. //depot/projects/ia64/share/man/man4/wlan_amrr.4#3 integrate
.. //depot/projects/ia64/share/man/man4/wlan_xauth.4#3 integrate
.. //depot/projects/ia64/share/man/man4/wpi.4#2 integrate
.. //depot/projects/ia64/share/man/man4/zyd.4#2 integrate
.. //depot/projects/ia64/share/man/man5/Makefile#30 integrate
.. //depot/projects/ia64/share/man/man5/regdomain.5#1 branch
.. //depot/projects/ia64/sys/amd64/amd64/machdep.c#54 integrate
.. //depot/projects/ia64/sys/amd64/conf/GENERIC#49 integrate
.. //depot/projects/ia64/sys/amd64/include/cpufunc.h#11 integrate
.. //depot/projects/ia64/sys/arm/arm/intr.c#16 integrate
.. //depot/projects/ia64/sys/arm/at91/at91.c#8 integrate
.. //depot/projects/ia64/sys/arm/conf/AVILA#7 integrate
.. //depot/projects/ia64/sys/arm/conf/HL200#3 integrate
.. //depot/projects/ia64/sys/arm/conf/KB920X#9 integrate
.. //depot/projects/ia64/sys/arm/include/intr.h#8 integrate
.. //depot/projects/ia64/sys/conf/NOTES#123 integrate
.. //depot/projects/ia64/sys/conf/files#164 integrate
.. //depot/projects/ia64/sys/conf/files.pc98#75 integrate
.. //depot/projects/ia64/sys/conf/options#114 integrate
.. //depot/projects/ia64/sys/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/ia64/sys/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/ia64/sys/contrib/pf/net/pf.c#26 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-all.c#78 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-dma.c#49 integrate
.. //depot/projects/ia64/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/ia64/sys/dev/ath/ah_osdep.h#3 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/amrr/amrr.c#9 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/amrr/amrr.h#3 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/onoe/onoe.c#9 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/onoe/onoe.h#4 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/sample/sample.c#10 integrate
.. //depot/projects/ia64/sys/dev/ath/ath_rate/sample/sample.h#6 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath.c#45 integrate
.. //depot/projects/ia64/sys/dev/ath/if_ath_pci.c#20 integrate
.. //depot/projects/ia64/sys/dev/ath/if_athioctl.h#16 integrate
.. //depot/projects/ia64/sys/dev/ath/if_athrate.h#6 integrate
.. //depot/projects/ia64/sys/dev/ath/if_athvar.h#27 integrate
.. //depot/projects/ia64/sys/dev/awi/am79c930.c#7 delete
.. //depot/projects/ia64/sys/dev/awi/am79c930reg.h#3 delete
.. //depot/projects/ia64/sys/dev/awi/am79c930var.h#4 delete
.. //depot/projects/ia64/sys/dev/awi/awi.c#24 delete
.. //depot/projects/ia64/sys/dev/awi/awireg.h#3 delete
.. //depot/projects/ia64/sys/dev/awi/awivar.h#10 delete
.. //depot/projects/ia64/sys/dev/awi/if_awi_pccard.c#18 delete
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_l2t.c#4 delete
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_l2t.h#4 delete
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_main.c#8 integrate
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_offload.c#4 integrate
.. //depot/projects/ia64/sys/dev/cxgb/cxgb_offload.h#6 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate
.. //depot/projects/ia64/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate
.. //depot/projects/ia64/sys/dev/if_ndis/if_ndis.c#32 integrate
.. //depot/projects/ia64/sys/dev/if_ndis/if_ndisvar.h#17 integrate
.. //depot/projects/ia64/sys/dev/ipw/if_ipw.c#14 integrate
.. //depot/projects/ia64/sys/dev/ipw/if_ipwvar.h#8 integrate
.. //depot/projects/ia64/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/ia64/sys/dev/iwi/if_iwi.c#19 integrate
.. //depot/projects/ia64/sys/dev/iwi/if_iwivar.h#10 integrate
.. //depot/projects/ia64/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/ia64/sys/dev/malo/if_malo.h#2 integrate
.. //depot/projects/ia64/sys/dev/ral/if_ral_pci.c#7 integrate
.. //depot/projects/ia64/sys/dev/ral/if_ralrate.c#2 delete
.. //depot/projects/ia64/sys/dev/ral/if_ralrate.h#2 delete
.. //depot/projects/ia64/sys/dev/ral/rt2560.c#9 integrate
.. //depot/projects/ia64/sys/dev/ral/rt2560reg.h#4 integrate
.. //depot/projects/ia64/sys/dev/ral/rt2560var.h#5 integrate
.. //depot/projects/ia64/sys/dev/ral/rt2661.c#8 integrate
.. //depot/projects/ia64/sys/dev/ral/rt2661_ucode.h#2 delete
.. //depot/projects/ia64/sys/dev/ral/rt2661var.h#4 integrate
.. //depot/projects/ia64/sys/dev/sound/pci/hda/hdac.c#12 integrate
.. //depot/projects/ia64/sys/dev/usb/if_rum.c#6 integrate
.. //depot/projects/ia64/sys/dev/usb/if_rumvar.h#3 integrate
.. //depot/projects/ia64/sys/dev/usb/if_ural.c#18 integrate
.. //depot/projects/ia64/sys/dev/usb/if_uralvar.h#7 integrate
.. //depot/projects/ia64/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/ia64/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/ia64/sys/dev/usb/uipaq.c#5 integrate
.. //depot/projects/ia64/sys/dev/usb/usbdevs#89 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wavelan_ieee.h#15 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi.c#71 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pccard.c#43 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wi_pci.c#24 integrate
.. //depot/projects/ia64/sys/dev/wi/if_wivar.h#25 integrate
.. //depot/projects/ia64/sys/dev/wi/spectrum24t_cf.h#3 delete
.. //depot/projects/ia64/sys/dev/wpi/if_wpi.c#3 integrate
.. //depot/projects/ia64/sys/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/ia64/sys/i386/conf/GENERIC#78 integrate
.. //depot/projects/ia64/sys/i386/conf/PAE#24 integrate
.. //depot/projects/ia64/sys/i386/include/cpufunc.h#21 integrate
.. //depot/projects/ia64/sys/ia64/ia64/mp_machdep.c#47 integrate
.. //depot/projects/ia64/sys/ia64/ia64/pmap.c#107 integrate
.. //depot/projects/ia64/sys/mips/conf/IDT#2 integrate
.. //depot/projects/ia64/sys/modules/Makefile#110 integrate
.. //depot/projects/ia64/sys/modules/ath_rate_amrr/Makefile#6 integrate
.. //depot/projects/ia64/sys/modules/ath_rate_onoe/Makefile#5 integrate
.. //depot/projects/ia64/sys/modules/ath_rate_sample/Makefile#5 integrate
.. //depot/projects/ia64/sys/modules/awi/Makefile#5 delete
.. //depot/projects/ia64/sys/modules/cxgb/cxgb/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/cxgb/tom/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/firmware/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/malo/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/ral/Makefile#4 integrate
.. //depot/projects/ia64/sys/modules/ralfw/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/ralfw/Makefile.inc#1 branch
.. //depot/projects/ia64/sys/modules/ralfw/rt2561/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/ralfw/rt2561s/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/ralfw/rt2661/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/wlan/Makefile#8 integrate
.. //depot/projects/ia64/sys/modules/wlan_acl/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/wlan_amrr/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/wlan_ccmp/Makefile#3 integrate
.. //depot/projects/ia64/sys/modules/wlan_rssadapt/Makefile#1 branch
.. //depot/projects/ia64/sys/modules/wlan_scan_ap/Makefile#2 delete
.. //depot/projects/ia64/sys/modules/wlan_scan_sta/Makefile#2 delete
.. //depot/projects/ia64/sys/modules/wlan_tkip/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/wlan_wep/Makefile#2 integrate
.. //depot/projects/ia64/sys/modules/wlan_xauth/Makefile#2 integrate
.. //depot/projects/ia64/sys/net/if.c#63 integrate
.. //depot/projects/ia64/sys/net/if_media.h#23 integrate
.. //depot/projects/ia64/sys/net80211/_ieee80211.h#9 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211.c#26 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211.h#13 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_acl.c#5 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_adhoc.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_adhoc.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_amrr.c#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_amrr.h#2 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto.c#10 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto.h#9 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto_ccmp.c#6 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto_none.c#5 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto_tkip.c#6 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_crypto_wep.c#6 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_ddb.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_dfs.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_dfs.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_freebsd.c#13 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_freebsd.h#10 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_hostap.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_hostap.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_ht.h#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_input.c#28 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_input.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.c#25 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_ioctl.h#13 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_monitor.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_monitor.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_node.c#25 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_node.h#19 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_output.c#26 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_phy.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_phy.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_power.h#2 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_proto.c#20 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_proto.h#16 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_regdomain.h#2 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_rssadapt.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_rssadapt.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_scan_ap.c#3 delete
.. //depot/projects/ia64/sys/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_sta.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_sta.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_var.h#23 integrate
.. //depot/projects/ia64/sys/net80211/ieee80211_wds.c#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_wds.h#1 branch
.. //depot/projects/ia64/sys/net80211/ieee80211_xauth.c#4 integrate
.. //depot/projects/ia64/sys/netgraph/ng_base.c#38 integrate
.. //depot/projects/ia64/sys/netinet/in_pcb.c#59 integrate
.. //depot/projects/ia64/sys/netinet/ip_fw2.c#73 integrate
.. //depot/projects/ia64/sys/netinet/ip_output.c#67 integrate
.. //depot/projects/ia64/sys/netinet/tcp_offload.h#2 integrate
.. //depot/projects/ia64/sys/netinet/tcp_syncache.c#55 integrate
.. //depot/projects/ia64/sys/netinet/tcp_var.h#43 integrate
.. //depot/projects/ia64/sys/netinet6/in6_pcb.c#39 integrate
.. //depot/projects/ia64/sys/pc98/cbus/clock.c#9 integrate
.. //depot/projects/ia64/sys/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/ia64/sys/pc98/conf/GENERIC#66 integrate
.. //depot/projects/ia64/sys/pc98/include/clock.h#4 integrate
.. //depot/projects/ia64/sys/security/audit/audit_arg.c#13 integrate
.. //depot/projects/ia64/sys/security/mac/mac_inet.c#9 integrate
.. //depot/projects/ia64/sys/sparc64/conf/GENERIC#70 integrate
.. //depot/projects/ia64/sys/sys/param.h#89 integrate
.. //depot/projects/ia64/tools/tools/net80211/Makefile#4 integrate
.. //depot/projects/ia64/tools/tools/net80211/scripts/config#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.dfs#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.fixed#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.local#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.mixed#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.simple#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.simple2#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.sta#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.tsn#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.updown#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.updown.wpa#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wds#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wdsmain#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wdsrelay#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wep#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa1.aes#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa1.tkip#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa2#1 branch
.. //depot/projects/ia64/tools/tools/net80211/scripts/setup.wpa2.tkip#1 branch
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/main.c#4 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanstats/wlanstats.c#6 integrate
.. //depot/projects/ia64/tools/tools/net80211/wlanwds/Makefile#1 branch
.. //depot/projects/ia64/tools/tools/net80211/wlanwds/wlanwds.c#1 branch
.. //depot/projects/ia64/usr.bin/procstat/procstat.1#2 integrate
.. //depot/projects/ia64/usr.sbin/wlandebug/wlandebug.c#2 integrate
.. //depot/projects/ia64/usr.sbin/wpa/hostapd/Makefile#5 integrate
.. //depot/projects/ia64/usr.sbin/wpa/hostapd/driver_freebsd.c#6 integrate
.. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/Packet32.c#4 integrate
.. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#8 integrate
.. //depot/projects/ia64/usr.sbin/wpa/wpa_supplicant/driver_wired.c#1 branch
Differences ...
==== //depot/projects/ia64/ObsoleteFiles.inc#25 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.137 2008/04/20 16:03:19 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -19,6 +19,22 @@
OLD_FILES+=usr/sbin/pkg_sign
OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
+# 20080325: tzdata2008b import
+OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
+OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
+# 20080314: stack_print(9) mlink fixed
+OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
+# 20080312: libkse removal
+OLD_FILES+=usr/include/sys/kse.h
+OLD_FILES+=usr/lib/libkse.so
+OLD_LIBS+=usr/lib/libkse.so.3
+OLD_FILES+=usr/share/man/man2/kse.2.gz
+OLD_FILES+=usr/share/man/man2/kse_create.2.gz
+OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
+OLD_FILES+=usr/share/man/man2/kse_release.2.gz
+OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
+OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
+OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
==== //depot/projects/ia64/UPDATING#103 (text+ko) ====
@@ -22,6 +22,16 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080420:
+ The 802.11 wireless support was redone to enable multi-bss
+ operation on devices that are capable. The underlying device
+ is no longer used directly but instead wlanX devices are
+ cloned with ifconfig. This requires changes to rc.conf files.
+
+ As part of the multi-bss changes the wlan_scan_ap and wlan_scan_sta
+ modules were merged into the base wlan module. All references
+ to these modules (e.g. in kernel config files) must be removed.
+
20080408:
psm(4) has gained write(2) support in native operation level.
Arbitrary commands can be written to /dev/psm%d and status can
@@ -1014,4 +1024,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $
+$FreeBSD: src/UPDATING,v 1.525 2008/04/20 21:25:37 sam Exp $
==== //depot/projects/ia64/etc/Makefile#60 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $
+# $FreeBSD: src/etc/Makefile,v 1.367 2008/04/20 20:37:02 sam Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@
portsnap.conf pf.os phones profile protocols \
rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
rc.sendmail rc.shutdown \
- rc.subr remote rpc services shells \
+ rc.subr regdomain.xml remote rpc services shells \
snmpd.config sysctl.conf syslog.conf \
etc.${MACHINE_ARCH}/ttys \
${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
==== //depot/projects/ia64/etc/defaults/rc.conf#82 (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.330 2008/04/08 23:50:03 emax Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.331 2008/04/20 20:37:20 sam Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -184,6 +184,7 @@
#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
#ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry.
#ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0.
+#vaps_ath0="wlan0" # VAP interfaces for ath0 device
#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
==== //depot/projects/ia64/etc/network.subr#23 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.182 2008/03/28 06:50:06 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.183 2008/04/20 20:37:20 sam Exp $
#
#
@@ -30,6 +30,56 @@
# Requires that rc.conf be loaded first.
#
+# ifn_start ifn
+# Bring up and configure an interface. If some configuration is applied
+# print the interface configuration.
+#
+ifn_start()
+{
+ local ifn cfg
+ ifn="$1"
+ cfg=1
+
+ [ -z "$ifn" ] && err 1 "ifn_start called without an interface"
+
+ ifscript_up ${ifn} && cfg=0
+ ifconfig_up ${ifn} && cfg=0
+ ipv4_up ${ifn} && cfg=0
+ ipx_up ${ifn} && cfg=0
+ childif_create ${ifn} && cfg=0
+
+ if [ "$cfg" -eq 0 ]; then
+ ifconfig ${ifn}
+ fi
+
+ return $cfg
+}
+
+# ifn_start ifn
+# Shutdown and de-configure an interface. If action is taken print the
+# interface name.
+#
+ifn_stop()
+{
+ local ifn cfg
+ ifn="$1"
+ cfg=1
+
+ [ -z "$ifn" ] && return 1
+
+ ipx_down ${ifn} && cfg=0
+ ipv4_down ${ifn} && cfg=0
+ ifconfig_down ${ifn} && cfg=0
+ ifscript_down ${ifn} && cfg=0
+ childif_destroy ${ifn} && cfg=0
+
+ if [ "$cfg" -eq 0 ]; then
+ echo -n " ${ifn}"
+ fi
+
+ return $cfg
+}
+
# ifconfig_up if
# Evaluate ifconfig(8) arguments for interface $if and
# run ifconfig(8) with those arguments. It returns 0 if
@@ -43,8 +93,8 @@
ifconfig_args=`ifconfig_getargs $1`
if [ -n "${ifconfig_args}" ]; then
+ ifconfig $1 ${ifconfig_args}
ifconfig $1 up
- ifconfig $1 ${ifconfig_args}
_cfg=0
fi
@@ -452,6 +502,44 @@
debug "Destroyed clones: ${_list}"
}
+# Create and configure child interfaces.
+# Return 0 if child interfaces are created.
+#
+childif_create()
+{
+ local cfg child child_vaps create_args ifn i
+ cfg=1
+
+ ifn=$1
+
+ # Create VAPs
+ child_vaps=`get_if_var $ifn vaps_IF`
+ for child in ${child_vaps}; do
+ create_args="wlandev $ifn `get_if_var $child vap_create_IF`"
+ if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then
+ ifconfig $child create ${create_args} && cfg=0
+ else
+ i=`ifconfig wlan create ${create_args}`
+ ifconfig $i name $child && cfg=0
+ fi
+ ifn_start $child
+ done
+
+ return
+}
+
+# Destroy child interfaces.
+#
+childif_destroy()
+{
+ local cfg child child_vaps ifn
+
+ child_vaps=`get_if_var $ifn vaps_IF`
+ for child in ${child_vaps}; do
+ ifconfig $child destroy && cfg=0
+ done
+}
+
# Create netgraph nodes.
#
ng_mkpeer() {
==== //depot/projects/ia64/etc/rc.d/hostapd#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/hostapd,v 1.2 2007/11/14 21:19:15 brix Exp $
+# $FreeBSD: src/etc/rc.d/hostapd,v 1.3 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: hostapd
@@ -18,6 +18,7 @@
command_args="-P ${pidfile} -B ${conf_file}"
required_files="${conf_file}"
+required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp"
extra_commands="reload"
load_rc_config ${name}
==== //depot/projects/ia64/etc/rc.d/netif#19 (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.25 2008/01/26 11:22:12 mtm Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.26 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: netif
@@ -68,7 +68,7 @@
fi
# Configure the interface(s).
- network_common ifn_start verbose
+ network_common ifn_start
if [ -f /etc/rc.d/ipfilter ] ; then
# Resync ipfilter
@@ -92,34 +92,31 @@
echo '.'
}
-# network_common routine verbose
+# network_common routine
# Common configuration subroutine for network interfaces. This
# routine takes all the preparatory steps needed for configuriing
-# an interface and then calls $routine. If $verbose is specified,
-# it will call ifconfig(8) to show, in long format, the configured
-# interfaces. If $verbose is not given, it will simply output the
-# configured interface(s).
+# an interface and then calls $routine.
network_common()
{
- local _cooked_list _fail _func _verbose
+ local _cooked_list _fail _func
_func=
- _verbose=
if [ -z "$1" ]; then
err 1 "network_common(): No function name specified."
else
_func="$1"
fi
- [ -n "$2" ] && _verbose=yes
# Set the scope of the command (all interfaces or just one).
#
_cooked_list=
if [ -n "$cmdifn" ]; then
- # Don't check that the interfaces exist. We need to run
+ # Don't check that the interface(s) exist. We need to run
# the down code even when the interface doesn't exist to
# kill off wpa_supplicant.
+ # XXXBED: is this really true or does wpa_supplicant die?
+ # if so, we should get rid of the devd entry
_cooked_list="$cmdifn"
else
_cooked_list="`list_net_interfaces`"
@@ -127,59 +124,13 @@
_fail=
for ifn in ${_cooked_list}; do
- if ${_func} ${ifn} ; then
- eval showstat_$ifn=1
- else
- _fail="$_fail $ifn"
+ if ! ${_func} ${ifn} $2; then
+ _fail="${_fail} ${ifn}"
fi
done
- # Display interfaces configured by this script
- #
- for ifn in ${_cooked_list}; do
- eval showstat=\$showstat_${ifn}
- if [ ! -z ${showstat} ]; then
- if [ -n "$_verbose" ]; then
- ifconfig ${ifn}
- else
- echo -n " ${ifn}"
- fi
- fi
- done
debug "The following interfaces were not configured: $_fail"
}
-ifn_start()
-{
- local ifn cfg
- ifn="$1"
- cfg=1
-
- [ -z "$ifn" ] && return 1
-
- ifscript_up ${ifn} && cfg=0
- ifconfig_up ${ifn} && cfg=0
- ipv4_up ${ifn} && cfg=0
- ipx_up ${ifn} && cfg=0
-
- return $cfg
-}
-
-ifn_stop()
-{
- local ifn cfg
- ifn="$1"
- cfg=1
-
- [ -z "$ifn" ] && return 1
-
- ipx_down ${ifn} && cfg=0
- ipv4_down ${ifn} && cfg=0
- ifconfig_down ${ifn} && cfg=0
- ifscript_down ${ifn} && cfg=0
-
- return $cfg
-}
-
load_rc_config $name
run_rc_command $*
==== //depot/projects/ia64/etc/rc.d/wpa_supplicant#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $
+# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.6 2008/04/20 20:37:21 sam Exp $
#
# PROVIDE: wpa_supplicant
@@ -30,18 +30,21 @@
test "$media" = "Ethernet"
}
-case ${ifn} in
-ndis*)
+is_ndis_interface()
+{
+ case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in
+ ndis*) true ;;
+ *) false ;;
+ esac
+}
+
+if is_wired_interface ${ifn} ; then
+ driver="wired"
+elif is_ndis_interface ${ifn} ; then
driver="ndis"
- ;;
-*)
- if is_wired_interface ${ifn} ; then
- driver="wired"
- else
- driver="bsd"
- fi
- ;;
-esac
+else
+ driver="bsd"
+fi
load_rc_config $name
@@ -50,5 +53,6 @@
pidfile="/var/run/${name}/${ifn}.pid"
command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
required_files=$conf_file
+required_modules="wlan_wep wlan_tkip wlan_ccmp"
run_rc_command "$1"
==== //depot/projects/ia64/lib/libc/stdlib/strfmon.c#12 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.16 2008/04/13 08:05:08 delphij Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.18 2008/04/19 07:22:58 ru Exp $");
#include <sys/types.h>
#include <ctype.h>
@@ -67,6 +67,8 @@
while (isdigit((unsigned char)*fmt)) { \
VAR *= 10; \
VAR += *fmt - '0'; \
+ if (VAR < 0) \
+ goto e2big_error; \
fmt++; \
} \
} while (0)
@@ -187,7 +189,7 @@
/* Do we have enough space to put number with
* required width ?
*/
- if (dst + width >= s + maxsize)
+ if ((unsigned int)width >= maxsize - (dst - s))
goto e2big_error;
}
@@ -196,6 +198,8 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(left_prec);
+ if ((unsigned int)left_prec >= maxsize - (dst - s))
+ goto e2big_error;
}
/* Right precision */
@@ -203,6 +207,9 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(right_prec);
+ if ((unsigned int)right_prec >= maxsize - (dst - s) -
+ left_prec)
+ goto e2big_error;
}
/* Conversion Characters */
@@ -218,6 +225,8 @@
goto format_error;
}
+ if (currency_symbol != NULL)
+ free(currency_symbol);
if (flags & USE_INTL_CURRENCY) {
currency_symbol = strdup(lc->int_curr_symbol);
if (currency_symbol != NULL)
@@ -246,6 +255,8 @@
pad_size = 0;
}
+ if (asciivalue != NULL)
+ free(asciivalue);
asciivalue = __format_grouped_double(value, &flags,
left_prec, right_prec, pad_char);
if (asciivalue == NULL)
==== //depot/projects/ia64/lib/libc/sys/cpuset.2#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.1 2008/03/29 10:06:30 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -36,6 +36,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset "cpusetid_t *setid"
==== //depot/projects/ia64/lib/libc/sys/cpuset_getaffinity.2#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.1 2008/03/29 10:26:29 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -35,6 +35,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset_getaffinity "cpulevel_t level" "cpuwhich_t which" "id_t id" "size_t setsize" "cpuset_t *mask"
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 (text+ko) ====
@@ -7,9 +7,6 @@
<!-- Text constants which probably don't need to be changed.-->
-<!-- The marker for MFCs. -->
-<!ENTITY merged "[MERGED]">
-
<!ENTITY % include.historic "IGNORE">
<!ENTITY % no.include.historic "IGNORE">
]>
@@ -20,7 +17,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1085 2008/04/17 00:57:34 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1088 2008/04/20 18:17:33 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -145,27 +142,27 @@
assignment. The &man.cpuset.1; userland utility has been added
to allow manipulation of processor sets.</para>
- <para>The &man.ddb.4; kernel debugger now has an output capture
+ <para role="merged">The &man.ddb.4; kernel debugger now has an output capture
facility. Input and output from &man.ddb.4; can now be captured
to a memory buffer for later inspection using &man.sysctl.8; or
a textdump. The new <command>capture</command> command controls
- this feature. &merged;</para>
+ this feature.</para>
- <para>The &man.ddb.4; debugger now supports a simple scripting
+ <para role="merged">The &man.ddb.4; debugger now supports a simple scripting
facility, which supports a set of named scripts consisting of a
set of &man.ddb.4; commands. These commands can be managed from
within &man.ddb.4; or with the use of the new &man.ddb.8;
utility. More details can be found in the &man.ddb.4; manual
- page. &merged;</para>
+ page.</para>
- <para>The kernel now supports a new textdump format of kernel
+ <para role="merged">The kernel now supports a new textdump format of kernel
dumps. A textdump provides higher-level information via
mechanically generated/extracted debugging output, rather than a
simple memory dump. This facility can be used to generate brief
kernel bug reports that are rich in debugging information, but
are not dependent on kernel symbol tables or precisely
synchronized source code. More information can be found in the
- &man.textdump.4; manual page. &merged;</para>
+ &man.textdump.4; manual page.</para>
<para>Kernel support for M:N threading has been removed. While
the KSE (Kernel Scheduled Entities) project was quite successful
@@ -181,39 +178,39 @@
interface for user applications to test the presence of
features.</para>
- <para>[&arch.amd64;] The &os; kernel now has support for large
+ <para arch="amd64">The &os; kernel now has support for large
memory page mappings (<quote>superpages</quote>).</para>
- <para>[&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE
+ <para arch="amd64,i386,ia64,powerpc" role="merged">The ULE
scheduler is now the default process scheduler
- in <filename>GENERIC</filename> kernels. &merged;</para>
+ in <filename>GENERIC</filename> kernels.</para>
<sect3 id="boot">
<title>Boot Loader Changes</title>
- <para>[&arch.amd64;, &arch.i386;] The BTX kernel used by the boot
+ <para arch="amd64,i386" role="merged">The BTX kernel used by the boot
loader has been changed to invoke BIOS routines from real
mode. This change makes it possible to boot &os; from USB
- devices. &merged;</para>
+ devices.</para>
- <para>[&arch.amd64;, &arch.i386;] A new gptboot boot loader has
+ <para arch="amd64,i386" role="merged">A new gptboot boot loader has
been added to support booting from a GPT labeled disk. A
new <command>boot</command> command has been added to
&man.gpt.8;, which makes a GPT disk bootable by writing the
required bits of the boot loader, creating a new boot
- partition if required. &merged;</para>
+ partition if required.</para>
</sect3>
<sect3 id="proc">
<title>Hardware Support</title>
- <para>The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
- PCMCIA smartcard readers, has been added. &merged;</para>
+ <para role="merged">The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
+ PCMCIA smartcard readers, has been added.</para>
- <para>The &man.uslcom.4; driver, a driver for Silicon
+ <para role="merged">The &man.uslcom.4; driver, a driver for Silicon
Laboratories CP2101/CP2102-based USB serial adapters, has been
- imported from OpenBSD. &merged;</para>
+ imported from OpenBSD.</para>
<sect4 id="mm">
<title>Multimedia Support</title>
@@ -250,9 +247,8 @@
number of outstanding issues. It also now works on all
architectures.</para>
- <para>[&arch.amd64;, &arch.i386;] The &man.wpi.4; driver has
- been updated to include a number of stability fixes.
- &merged;</para>
+ <para arch="amd64,i386" role="merged">The &man.wpi.4; driver has
+ been updated to include a number of stability fixes.</para>
</sect4>
</sect3>
@@ -267,16 +263,16 @@
the <varname>net.bpf.zerocopy_enable</varname> sysctl
variable to <literal>1</literal>.</para>
- <para>A bug in TCP options padding, where the wrong padding
- bytes were used, has been fixed. &merged;</para>
+ <para role="merged">A bug in TCP options padding, where the wrong padding
+ bytes were used, has been fixed.</para>
</sect3>
<sect3 id="disks">
<title>Disks and Storage</title>
- <para>The &man.aac.4; driver now supports volumes larger than
- 2TB in size. &merged;</para>
+ <para role="merged">The &man.aac.4; driver now supports volumes larger than
+ 2TB in size.</para>
<para>The &man.ata.4; driver now supports a spindown command for
disks; after a configurable amount of time, if no requests
@@ -285,8 +281,8 @@
supports a <command>spindown</command> command to configure
this feature.</para>
- <para>The &man.hptrr.4; driver has been updated to version 1.2
- from Highpoint. &merged;</para>
+ <para role="merged">The &man.hptrr.4; driver has been updated to version 1.2
+ from Highpoint.</para>
</sect3>
@@ -307,23 +303,31 @@
<sect2 id="userland">
<title>Userland Changes</title>
- <para>The &man.adduser.8; utility now supports
+ <para role="merged">The &man.adduser.8; utility now supports
a <option>-M</option> option to set the mode of a new user's
- home directory. &merged;</para>
+ home directory.</para>
<para>BSD-licensed versions of &man.ar.1; and &man.ranlib.1;,
based on <filename>libarchive</filename>, have replaced the GNU
Binutils versions of these utilities.</para>
- <para>&man.chflags.1; now supports a <option>-v</option> flag for
+ <para role="merged">&man.chflags.1; now supports a <option>-v</option> flag for
verbose output and a <option>-f</option> flag to ignore errors
with the same semantics as (for example)
- &man.chmod.1;. &merged;</para>
+ &man.chmod.1;.</para>
<para>For compatiblity with other implementations, &man.cp.1; now
supports a <option>-a</option> flag, which is equivalent to
specifying the <option>-RrP</option> flags.</para>
+ <para>The &man.env.1; program now supports <option>-u
+ <replaceable>name</replaceable></option>
+ which will completely unset the given variable
+ <replaceable>name</replaceable> by removing it from the environment,
+ instead of just setting it to a null value.</para>
+
+ <para>The &man.fdopendir.3; library function has been added.</para>
+
<para>&man.find.1; has been enhanced by the addition of a number
of primaries that were present in GNU find but not &os;
&man.find.1;.</para>
@@ -342,9 +346,9 @@
<para>The &man.procstat.1; utility has been added to display
detailed information about processes.</para>
- <para>The &man.realpath.1; utility now supports
+ <para role="merged">The &man.realpath.1; utility now supports
a <option>-q</option> flag to suppress warnings; it now also
- accepts multiple paths on its command line. &merged; </para>
+ accepts multiple paths on its command line.</para>
<para>The &man.split.1; utility now supports a <option>-n</option>
flag to split a file into a certain number of chunks.</para>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon Apr 21 00:19:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0F7F91065719; Mon, 21 Apr 2008 00:19:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id AC7001065717
for <perforce@freebsd.org>; Mon, 21 Apr 2008 00:19:20 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 915D78FC17
for <perforce@freebsd.org>; Mon, 21 Apr 2008 00:19:20 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3L0JKO7004030
for <perforce@freebsd.org>; Mon, 21 Apr 2008 00:19:20 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3L0JJfl004028
for perforce@freebsd.org; Mon, 21 Apr 2008 00:19:19 GMT
(envelope-from jb@freebsd.org)
Date: Mon, 21 Apr 2008 00:19:19 GMT
Message-Id: <200804210019.m3L0JJfl004028@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140340 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Apr 2008 00:19:21 -0000
http://perforce.freebsd.org/chv.cgi?CH=140340
Change 140340 by jb@freebsd3 on 2008/04/21 00:19:05
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#4 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#68 integrate
.. //depot/projects/dtrace/doc/share/sgml/man-refs.ent#32 integrate
.. //depot/projects/dtrace/ports/LEGAL#39 integrate
.. //depot/projects/dtrace/ports/MOVED#78 integrate
.. //depot/projects/dtrace/src/ObsoleteFiles.inc#43 integrate
.. //depot/projects/dtrace/src/UPDATING#29 integrate
.. //depot/projects/dtrace/src/contrib/hostapd/driver_wired.c#5 delete
.. //depot/projects/dtrace/src/etc/Makefile#13 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#31 integrate
.. //depot/projects/dtrace/src/etc/network.subr#13 integrate
.. //depot/projects/dtrace/src/etc/rc.d/hostapd#5 integrate
.. //depot/projects/dtrace/src/etc/rc.d/netif#7 integrate
.. //depot/projects/dtrace/src/etc/rc.d/wpa_supplicant#5 integrate
.. //depot/projects/dtrace/src/etc/regdomain.xml#1 branch
.. //depot/projects/dtrace/src/lib/libc/sys/cpuset.2#2 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/cpuset_getaffinity.2#2 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#22 integrate
.. //depot/projects/dtrace/src/release/doc/share/sgml/release.dsl#4 integrate
.. //depot/projects/dtrace/src/release/doc/share/sgml/release.ent#8 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/Makefile#5 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifconfig.8#18 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifieee80211.c#11 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/ifmedia.c#7 integrate
.. //depot/projects/dtrace/src/sbin/ifconfig/regdomain.c#1 branch
.. //depot/projects/dtrace/src/sbin/ifconfig/regdomain.h#1 branch
.. //depot/projects/dtrace/src/share/man/man4/Makefile#34 integrate
.. //depot/projects/dtrace/src/share/man/man4/altq.4#11 integrate
.. //depot/projects/dtrace/src/share/man/man4/ath.4#9 integrate
.. //depot/projects/dtrace/src/share/man/man4/awi.4#6 delete
.. //depot/projects/dtrace/src/share/man/man4/cnw.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/ipw.4#8 integrate
.. //depot/projects/dtrace/src/share/man/man4/iwi.4#8 integrate
.. //depot/projects/dtrace/src/share/man/man4/malo.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/ral.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/rum.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/ural.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/wi.4#7 integrate
.. //depot/projects/dtrace/src/share/man/man4/wlan.4#6 integrate
.. //depot/projects/dtrace/src/share/man/man4/wlan_acl.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/wlan_amrr.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man4/wlan_xauth.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/wpi.4#4 integrate
.. //depot/projects/dtrace/src/share/man/man4/zyd.4#2 integrate
.. //depot/projects/dtrace/src/share/man/man5/Makefile#9 integrate
.. //depot/projects/dtrace/src/share/man/man5/regdomain.5#1 branch
.. //depot/projects/dtrace/src/sys/amd64/conf/GENERIC#37 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/intr.c#10 integrate
.. //depot/projects/dtrace/src/sys/arm/at91/at91.c#12 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/AVILA#9 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/HL200#4 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/KB920X#11 integrate
.. //depot/projects/dtrace/src/sys/arm/include/intr.h#5 integrate
.. //depot/projects/dtrace/src/sys/conf/NOTES#46 integrate
.. //depot/projects/dtrace/src/sys/conf/files#84 integrate
.. //depot/projects/dtrace/src/sys/conf/options#48 integrate
.. //depot/projects/dtrace/src/sys/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/dtrace/src/sys/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/dtrace/src/sys/contrib/pf/net/pf.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-all.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ah_osdep.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/amrr/amrr.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/amrr/amrr.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/onoe/onoe.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/onoe/onoe.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/sample/sample.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/ath_rate/sample/sample.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath.c#19 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_ath_pci.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_athioctl.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_athrate.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ath/if_athvar.h#12 integrate
.. //depot/projects/dtrace/src/sys/dev/awi/am79c930.c#4 delete
.. //depot/projects/dtrace/src/sys/dev/awi/am79c930reg.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/awi/am79c930var.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/awi/awi.c#5 delete
.. //depot/projects/dtrace/src/sys/dev/awi/awireg.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/awi/awivar.h#6 delete
.. //depot/projects/dtrace/src/sys/dev/awi/if_awi_pccard.c#6 delete
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndis.c#14 integrate
.. //depot/projects/dtrace/src/sys/dev/if_ndis/if_ndisvar.h#7 integrate
.. //depot/projects/dtrace/src/sys/dev/ipw/if_ipw.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/ipw/if_ipwvar.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwi.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/iwi/if_iwivar.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/malo/if_malo.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/if_ral_pci.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/if_ralrate.c#4 delete
.. //depot/projects/dtrace/src/sys/dev/ral/if_ralrate.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/ral/rt2560.c#12 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2560reg.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2560var.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2661.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/ral/rt2661_ucode.h#3 delete
.. //depot/projects/dtrace/src/sys/dev/ral/rt2661var.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/sound/pci/hda/hdac.c#18 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#6 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_rumvar.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_ural.c#15 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_uralvar.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_zyd.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_zydreg.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/uipaq.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#30 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wavelan_ieee.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wi.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wi_pccard.c#4 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wi_pci.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/if_wivar.h#6 integrate
.. //depot/projects/dtrace/src/sys/dev/wi/spectrum24t_cf.h#4 delete
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpi.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/GENERIC#34 integrate
.. //depot/projects/dtrace/src/sys/i386/conf/PAE#10 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/IDT#2 integrate
.. //depot/projects/dtrace/src/sys/modules/Makefile#41 integrate
.. //depot/projects/dtrace/src/sys/modules/ath_rate_amrr/Makefile#7 integrate
.. //depot/projects/dtrace/src/sys/modules/ath_rate_onoe/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/modules/ath_rate_sample/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/modules/awi/Makefile#4 delete
.. //depot/projects/dtrace/src/sys/modules/firmware/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/malo/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/ral/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/ralfw/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ralfw/Makefile.inc#1 branch
.. //depot/projects/dtrace/src/sys/modules/ralfw/rt2561/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ralfw/rt2561s/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/ralfw/rt2661/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/wlan/Makefile#6 integrate
.. //depot/projects/dtrace/src/sys/modules/wlan_acl/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/wlan_amrr/Makefile#2 integrate
.. //depot/projects/dtrace/src/sys/modules/wlan_ccmp/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/wlan_rssadapt/Makefile#1 branch
.. //depot/projects/dtrace/src/sys/modules/wlan_scan_ap/Makefile#2 delete
.. //depot/projects/dtrace/src/sys/modules/wlan_scan_sta/Makefile#2 delete
.. //depot/projects/dtrace/src/sys/modules/wlan_tkip/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/wlan_wep/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/modules/wlan_xauth/Makefile#4 integrate
.. //depot/projects/dtrace/src/sys/net/if_media.h#7 integrate
.. //depot/projects/dtrace/src/sys/net80211/_ieee80211.h#6 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211.c#11 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211.h#10 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_acl.c#5 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_adhoc.c#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_adhoc.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_amrr.c#3 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_amrr.h#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto.c#5 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto.h#5 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto_ccmp.c#5 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto_none.c#5 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto_tkip.c#5 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_crypto_wep.c#5 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ddb.c#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_dfs.c#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_dfs.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_freebsd.c#7 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_freebsd.h#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_hostap.c#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_hostap.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ht.c#6 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ht.h#4 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_input.c#12 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_input.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.c#11 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_ioctl.h#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_monitor.c#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_monitor.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.c#9 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_node.h#6 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_output.c#13 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_phy.c#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_phy.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_power.c#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_power.h#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.c#9 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_proto.h#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_regdomain.h#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_rssadapt.c#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_rssadapt.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan_ap.c#3 delete
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_scan_sta.c#7 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_sta.c#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_sta.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_var.h#10 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_wds.c#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_wds.h#1 branch
.. //depot/projects/dtrace/src/sys/net80211/ieee80211_xauth.c#5 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_fw2.c#29 integrate
.. //depot/projects/dtrace/src/sys/netinet/tcp_var.h#10 integrate
.. //depot/projects/dtrace/src/sys/pc98/conf/GENERIC#17 integrate
.. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#20 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#51 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/Makefile#7 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/config#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.dfs#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.fixed#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.local#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.mixed#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.simple#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.simple2#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.sta#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.tsn#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.updown#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.updown.wpa#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.wds#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.wdsmain#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.wdsrelay#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.wep#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.wpa#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.wpa1.aes#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.wpa1.tkip#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.wpa2#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/scripts/setup.wpa2.tkip#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/main.c#5 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanstats/wlanstats.c#8 integrate
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanwds/Makefile#1 branch
.. //depot/projects/dtrace/src/tools/tools/net80211/wlanwds/wlanwds.c#1 branch
.. //depot/projects/dtrace/src/usr.sbin/wlandebug/wlandebug.c#2 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/hostapd/Makefile#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/hostapd/driver_freebsd.c#5 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/Packet32.c#6 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#7 integrate
.. //depot/projects/dtrace/src/usr.sbin/wpa/wpa_supplicant/driver_wired.c#1 branch
.. //depot/projects/dtrace/www/en/Makefile#8 integrate
.. //depot/projects/dtrace/www/en/community.sgml#6 delete
.. //depot/projects/dtrace/www/en/community.xsl#1 branch
.. //depot/projects/dtrace/www/en/projects/summerofcode.xsl#5 integrate
.. //depot/projects/dtrace/www/en/releases/6.3R/errata.html#7 integrate
.. //depot/projects/dtrace/www/share/sgml/events.xml#25 integrate
.. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#10 integrate
.. //depot/projects/dtrace/www/share/sgml/navibar.ent#11 integrate
.. //depot/projects/dtrace/www/share/sgml/templates.events.xsl#4 integrate
.. //depot/projects/dtrace/www/share/sgml/templates.usergroups.xsl#4 integrate
.. //depot/projects/dtrace/www/share/sgml/usergroups.dtd#3 integrate
.. //depot/projects/dtrace/www/share/sgml/usergroups.xml#20 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/remote-install/article.sgml#4 (text+ko) ====
@@ -17,7 +17,7 @@
<!-- 11 April 2008 -->
</author>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.3 2008/04/19 12:45:43 danger Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/remote-install/article.sgml,v 1.4 2008/04/19 23:40:22 brd Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -103,20 +103,20 @@
<itemizedlist>
<listitem>
- <para>have a network accessible operating system with
+ <para>Have a network accessible operating system with
<application>SSH</application> access</para>
</listitem>
<listitem>
- <para>understand the &os; installation process</para>
+ <para>Understand the &os; installation process</para>
</listitem>
<listitem>
- <para>be familiar with the &man.sysinstall.8; utility</para>
+ <para>Be familiar with the &man.sysinstall.8; utility</para>
</listitem>
<listitem>
- <para>have the &os; installation <acronym>ISO</acronym> image
+ <para>Have the &os; installation <acronym>ISO</acronym> image
or <acronym>CD</acronym> handy</para>
</listitem>
</itemizedlist>
@@ -268,7 +268,7 @@
that <devicename>sda</devicename> is the first bootable disk
device:</para>
- <screen>&prompt.root; <userinput>dd if=/root/disk.img of=/dev/sda bs=1M</userinput></screen>
+ <screen>&prompt.root; <userinput>dd if=/root/disk.img of=/dev/sda bs=1m</userinput></screen>
<para>If all went well, the image should now be in the
<acronym>MBR</acronym> of the first device and the machine can
@@ -449,7 +449,7 @@
<guimenuitem>Custom</guimenuitem> menu.</para>
<para>Finally, perform the system installation by selecting the
- latest available option - <guimenuitem>Commit</guimenuitem>.
+ last option, <guimenuitem>Commit</guimenuitem>.
Exit <application>sysinstall</application> when it finishes the
installation.</para>
</sect2>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#68 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.923 2008/04/16 19:02:41 delphij Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.924 2008/04/20 19:46:14 antoine Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11826,6 +11826,12 @@
</row>
<row>
+ <entry>7.0-STABLE after the MFC of F_DUP2FD command
+ to &man.fcntl.2;.</entry>
+ <entry>700107</entry>
+ </row>
+
+ <row>
<entry>8.0-CURRENT. Separating wide and single byte
ctype.</entry>
<entry>800000</entry>
==== //depot/projects/dtrace/doc/share/sgml/man-refs.ent#32 (text+ko) ====
@@ -20,7 +20,7 @@
lexicographical order by the entity (i.e., the dots used in place of
special characters should not be expanded when comparing).
- $FreeBSD: doc/share/sgml/man-refs.ent,v 1.460 2008/04/05 18:00:55 bmah Exp $
+ $FreeBSD: doc/share/sgml/man-refs.ent,v 1.461 2008/04/20 18:15:46 hrs Exp $
-->
<!ENTITY man...1 "<citerefentry/<refentrytitle/[/<manvolnum/1//">
@@ -1661,6 +1661,7 @@
<!ENTITY man.fclose.3 "<citerefentry/<refentrytitle/fclose/<manvolnum/3//">
<!ENTITY man.fcloseall.3 "<citerefentry/<refentrytitle/fcloseall/<manvolnum/3//">
<!ENTITY man.fdopen.3 "<citerefentry/<refentrytitle/fdopen/<manvolnum/3//">
+<!ENTITY man.fdopendir.3 "<citerefentry/<refentrytitle/fdopendir/<manvolnum/3//">
<!ENTITY man.feature.present.3 "<citerefentry/<refentrytitle/feature_present/<manvolnum/3//">
<!ENTITY man.feof.3 "<citerefentry/<refentrytitle/feof/<manvolnum/3//">
<!ENTITY man.ferror.3 "<citerefentry/<refentrytitle/ferror/<manvolnum/3//">
@@ -2948,6 +2949,7 @@
<!ENTITY man.tcflush.3 "<citerefentry/<refentrytitle/tcflush/<manvolnum/3//">
<!ENTITY man.tcgetattr.3 "<citerefentry/<refentrytitle/tcgetattr/<manvolnum/3//">
<!ENTITY man.tcgetpgrp.3 "<citerefentry/<refentrytitle/tcgetpgrp/<manvolnum/3//">
+<!ENTITY man.tcgetsid.3 "<citerefentry/<refentrytitle/tcgetsid/<manvolnum/3//">
<!ENTITY man.tcsendbreak.3 "<citerefentry/<refentrytitle/tcsendbreak/<manvolnum/3//">
<!ENTITY man.tcsetattr.3 "<citerefentry/<refentrytitle/tcsetattr/<manvolnum/3//">
<!ENTITY man.tcsetpgrp.3 "<citerefentry/<refentrytitle/tcsetpgrp/<manvolnum/3//">
==== //depot/projects/dtrace/ports/LEGAL#39 (text+ko) ====
@@ -1,5 +1,5 @@
# Creator: Jordan Hubbard
-# $FreeBSD: ports/LEGAL,v 1.577 2008/04/05 20:30:55 thierry Exp $
+# $FreeBSD: ports/LEGAL,v 1.578 2008/04/20 15:20:43 thierry Exp $
**********************************************************************
*** NOTE TO COMMITTERS ***
@@ -60,9 +60,10 @@
alephone/Marathon*.zip games/alephone-data Bungie/Microsoft do not allow
charging for Marathon data
files
-ads-java-novm-* databases/adstudio Free for personal or educational
- use but a commercial license is
- required for all other usages
+ads-java-novm-* databases/adstudio Only free for qualified Open Source
+ Software Developers but a commercial
+ license is required for all other
+ usages
altivore.c security/altivore No redistribution allowed
annelid-* games/annelid Redistribution is limited
apache_*ssl_* www/apache13-ssl Crypto; export-controlled
==== //depot/projects/dtrace/ports/MOVED#78 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1574 2008/04/17 21:36:26 miwi Exp $
+# $FreeBSD: ports/MOVED,v 1.1576 2008/04/20 22:40:34 pav Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3451,3 +3451,5 @@
x11-toolkits/tkstep80||2008-04-09|Has expired: development stalled for years, outdated, unmaintained
devel/p5-Tie-Watch|x11-toolkits/p5-Tk|2008-04-14|bundled with p5-Tk
games/teewars|games/teeworls|2008-04-17|Project renamed
+multimedia/exportvideo||2008-04-21|Add-on for soon to be removed nuppelvideo port
+multimedia/nuppelvideo||2008-04-21|Unmaintained upstream for years. The nuppelvideo format is now supported by mencoder
==== //depot/projects/dtrace/src/ObsoleteFiles.inc#43 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.137 2008/04/20 16:03:19 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -19,6 +19,22 @@
OLD_FILES+=usr/sbin/pkg_sign
OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
+# 20080325: tzdata2008b import
+OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
+OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
+# 20080314: stack_print(9) mlink fixed
+OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
+# 20080312: libkse removal
+OLD_FILES+=usr/include/sys/kse.h
+OLD_FILES+=usr/lib/libkse.so
+OLD_LIBS+=usr/lib/libkse.so.3
+OLD_FILES+=usr/share/man/man2/kse.2.gz
+OLD_FILES+=usr/share/man/man2/kse_create.2.gz
+OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
+OLD_FILES+=usr/share/man/man2/kse_release.2.gz
+OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
+OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
+OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
==== //depot/projects/dtrace/src/UPDATING#29 (text+ko) ====
@@ -22,6 +22,16 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080420:
+ The 802.11 wireless support was redone to enable multi-bss
+ operation on devices that are capable. The underlying device
+ is no longer used directly but instead wlanX devices are
+ cloned with ifconfig. This requires changes to rc.conf files.
+
+ As part of the multi-bss changes the wlan_scan_ap and wlan_scan_sta
+ modules were merged into the base wlan module. All references
+ to these modules (e.g. in kernel config files) must be removed.
+
20080408:
psm(4) has gained write(2) support in native operation level.
Arbitrary commands can be written to /dev/psm%d and status can
@@ -1014,4 +1024,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $
+$FreeBSD: src/UPDATING,v 1.525 2008/04/20 21:25:37 sam Exp $
==== //depot/projects/dtrace/src/etc/Makefile#13 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $
+# $FreeBSD: src/etc/Makefile,v 1.367 2008/04/20 20:37:02 sam Exp $
.include <bsd.own.mk>
@@ -17,7 +17,7 @@
portsnap.conf pf.os phones profile protocols \
rc rc.bsdextended rc.firewall rc.firewall6 rc.initdiskless \
rc.sendmail rc.shutdown \
- rc.subr remote rpc services shells \
+ rc.subr regdomain.xml remote rpc services shells \
snmpd.config sysctl.conf syslog.conf \
etc.${MACHINE_ARCH}/ttys \
${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
==== //depot/projects/dtrace/src/etc/defaults/rc.conf#31 (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.330 2008/04/08 23:50:03 emax Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.331 2008/04/20 20:37:20 sam Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -184,6 +184,7 @@
#ifconfig_lo0_alias0="inet 127.0.0.254 netmask 0xffffffff" # Sample alias entry.
#ifconfig_ed0_ipx="ipx 0x00010010" # Sample IPX address family entry.
#ifconfig_fxp0_name="net0" # Change interface name from fxp0 to net0.
+#vaps_ath0="wlan0" # VAP interfaces for ath0 device
#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
==== //depot/projects/dtrace/src/etc/network.subr#13 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.182 2008/03/28 06:50:06 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.183 2008/04/20 20:37:20 sam Exp $
#
#
@@ -30,6 +30,56 @@
# Requires that rc.conf be loaded first.
#
+# ifn_start ifn
+# Bring up and configure an interface. If some configuration is applied
+# print the interface configuration.
+#
+ifn_start()
+{
+ local ifn cfg
+ ifn="$1"
+ cfg=1
+
+ [ -z "$ifn" ] && err 1 "ifn_start called without an interface"
+
+ ifscript_up ${ifn} && cfg=0
+ ifconfig_up ${ifn} && cfg=0
+ ipv4_up ${ifn} && cfg=0
+ ipx_up ${ifn} && cfg=0
+ childif_create ${ifn} && cfg=0
+
+ if [ "$cfg" -eq 0 ]; then
+ ifconfig ${ifn}
+ fi
+
+ return $cfg
+}
+
+# ifn_start ifn
+# Shutdown and de-configure an interface. If action is taken print the
+# interface name.
+#
+ifn_stop()
+{
+ local ifn cfg
+ ifn="$1"
+ cfg=1
+
+ [ -z "$ifn" ] && return 1
+
+ ipx_down ${ifn} && cfg=0
+ ipv4_down ${ifn} && cfg=0
+ ifconfig_down ${ifn} && cfg=0
+ ifscript_down ${ifn} && cfg=0
+ childif_destroy ${ifn} && cfg=0
+
+ if [ "$cfg" -eq 0 ]; then
+ echo -n " ${ifn}"
+ fi
+
+ return $cfg
+}
+
# ifconfig_up if
# Evaluate ifconfig(8) arguments for interface $if and
# run ifconfig(8) with those arguments. It returns 0 if
@@ -43,8 +93,8 @@
ifconfig_args=`ifconfig_getargs $1`
if [ -n "${ifconfig_args}" ]; then
+ ifconfig $1 ${ifconfig_args}
ifconfig $1 up
- ifconfig $1 ${ifconfig_args}
_cfg=0
fi
@@ -452,6 +502,44 @@
debug "Destroyed clones: ${_list}"
}
+# Create and configure child interfaces.
+# Return 0 if child interfaces are created.
+#
+childif_create()
+{
+ local cfg child child_vaps create_args ifn i
+ cfg=1
+
+ ifn=$1
+
+ # Create VAPs
+ child_vaps=`get_if_var $ifn vaps_IF`
+ for child in ${child_vaps}; do
+ create_args="wlandev $ifn `get_if_var $child vap_create_IF`"
+ if expr $child : 'wlan[0-9][0-9]*$' >/dev/null 2>&1; then
+ ifconfig $child create ${create_args} && cfg=0
+ else
+ i=`ifconfig wlan create ${create_args}`
+ ifconfig $i name $child && cfg=0
+ fi
+ ifn_start $child
+ done
+
+ return
+}
+
+# Destroy child interfaces.
+#
+childif_destroy()
+{
+ local cfg child child_vaps ifn
+
+ child_vaps=`get_if_var $ifn vaps_IF`
+ for child in ${child_vaps}; do
+ ifconfig $child destroy && cfg=0
+ done
+}
+
# Create netgraph nodes.
#
ng_mkpeer() {
==== //depot/projects/dtrace/src/etc/rc.d/hostapd#5 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/hostapd,v 1.2 2007/11/14 21:19:15 brix Exp $
+# $FreeBSD: src/etc/rc.d/hostapd,v 1.3 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: hostapd
@@ -18,6 +18,7 @@
command_args="-P ${pidfile} -B ${conf_file}"
required_files="${conf_file}"
+required_modules="wlan_xauth wlan_wep wlan_tkip wlan_ccmp"
extra_commands="reload"
load_rc_config ${name}
==== //depot/projects/dtrace/src/etc/rc.d/netif#7 (text+ko) ====
@@ -22,7 +22,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/netif,v 1.25 2008/01/26 11:22:12 mtm Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.26 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: netif
@@ -68,7 +68,7 @@
fi
# Configure the interface(s).
- network_common ifn_start verbose
+ network_common ifn_start
if [ -f /etc/rc.d/ipfilter ] ; then
# Resync ipfilter
@@ -92,34 +92,31 @@
echo '.'
}
-# network_common routine verbose
+# network_common routine
# Common configuration subroutine for network interfaces. This
# routine takes all the preparatory steps needed for configuriing
-# an interface and then calls $routine. If $verbose is specified,
-# it will call ifconfig(8) to show, in long format, the configured
-# interfaces. If $verbose is not given, it will simply output the
-# configured interface(s).
+# an interface and then calls $routine.
network_common()
{
- local _cooked_list _fail _func _verbose
+ local _cooked_list _fail _func
_func=
- _verbose=
if [ -z "$1" ]; then
err 1 "network_common(): No function name specified."
else
_func="$1"
fi
- [ -n "$2" ] && _verbose=yes
# Set the scope of the command (all interfaces or just one).
#
_cooked_list=
if [ -n "$cmdifn" ]; then
- # Don't check that the interfaces exist. We need to run
+ # Don't check that the interface(s) exist. We need to run
# the down code even when the interface doesn't exist to
# kill off wpa_supplicant.
+ # XXXBED: is this really true or does wpa_supplicant die?
+ # if so, we should get rid of the devd entry
_cooked_list="$cmdifn"
else
_cooked_list="`list_net_interfaces`"
@@ -127,59 +124,13 @@
_fail=
for ifn in ${_cooked_list}; do
- if ${_func} ${ifn} ; then
- eval showstat_$ifn=1
- else
- _fail="$_fail $ifn"
+ if ! ${_func} ${ifn} $2; then
+ _fail="${_fail} ${ifn}"
fi
done
- # Display interfaces configured by this script
- #
- for ifn in ${_cooked_list}; do
- eval showstat=\$showstat_${ifn}
- if [ ! -z ${showstat} ]; then
- if [ -n "$_verbose" ]; then
- ifconfig ${ifn}
- else
- echo -n " ${ifn}"
- fi
- fi
- done
debug "The following interfaces were not configured: $_fail"
}
-ifn_start()
-{
- local ifn cfg
- ifn="$1"
- cfg=1
-
- [ -z "$ifn" ] && return 1
-
- ifscript_up ${ifn} && cfg=0
- ifconfig_up ${ifn} && cfg=0
- ipv4_up ${ifn} && cfg=0
- ipx_up ${ifn} && cfg=0
-
- return $cfg
-}
-
-ifn_stop()
-{
- local ifn cfg
- ifn="$1"
- cfg=1
-
- [ -z "$ifn" ] && return 1
-
- ipx_down ${ifn} && cfg=0
- ipv4_down ${ifn} && cfg=0
- ifconfig_down ${ifn} && cfg=0
- ifscript_down ${ifn} && cfg=0
-
- return $cfg
-}
-
load_rc_config $name
run_rc_command $*
==== //depot/projects/dtrace/src/etc/rc.d/wpa_supplicant#5 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $
+# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.6 2008/04/20 20:37:21 sam Exp $
#
# PROVIDE: wpa_supplicant
@@ -30,18 +30,21 @@
test "$media" = "Ethernet"
}
-case ${ifn} in
-ndis*)
+is_ndis_interface()
+{
+ case `sysctl -n net.wlan.${1#wlan}.%parent 2>/dev/null` in
+ ndis*) true ;;
+ *) false ;;
+ esac
+}
+
+if is_wired_interface ${ifn} ; then
+ driver="wired"
+elif is_ndis_interface ${ifn} ; then
driver="ndis"
- ;;
-*)
- if is_wired_interface ${ifn} ; then
- driver="wired"
- else
- driver="bsd"
- fi
- ;;
-esac
+else
+ driver="bsd"
+fi
load_rc_config $name
@@ -50,5 +53,6 @@
pidfile="/var/run/${name}/${ifn}.pid"
command_args="-B -i $ifn -c $conf_file -D $driver -P $pidfile"
required_files=$conf_file
+required_modules="wlan_wep wlan_tkip wlan_ccmp"
run_rc_command "$1"
==== //depot/projects/dtrace/src/lib/libc/sys/cpuset.2#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.1 2008/03/29 10:06:30 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -36,6 +36,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset "cpusetid_t *setid"
==== //depot/projects/dtrace/src/lib/libc/sys/cpuset_getaffinity.2#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.1 2008/03/29 10:26:29 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -35,6 +35,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset_getaffinity "cpulevel_t level" "cpuwhich_t which" "id_t id" "size_t setsize" "cpuset_t *mask"
==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#22 (text+ko) ====
@@ -7,9 +7,6 @@
<!-- Text constants which probably don't need to be changed.-->
-<!-- The marker for MFCs. -->
-<!ENTITY merged "[MERGED]">
-
<!ENTITY % include.historic "IGNORE">
<!ENTITY % no.include.historic "IGNORE">
]>
@@ -20,7 +17,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1085 2008/04/17 00:57:34 delphij Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/article.sgml,v 1.1088 2008/04/20 18:17:33 hrs Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -145,27 +142,27 @@
assignment. The &man.cpuset.1; userland utility has been added
to allow manipulation of processor sets.</para>
- <para>The &man.ddb.4; kernel debugger now has an output capture
+ <para role="merged">The &man.ddb.4; kernel debugger now has an output capture
facility. Input and output from &man.ddb.4; can now be captured
to a memory buffer for later inspection using &man.sysctl.8; or
a textdump. The new <command>capture</command> command controls
- this feature. &merged;</para>
+ this feature.</para>
- <para>The &man.ddb.4; debugger now supports a simple scripting
+ <para role="merged">The &man.ddb.4; debugger now supports a simple scripting
facility, which supports a set of named scripts consisting of a
set of &man.ddb.4; commands. These commands can be managed from
within &man.ddb.4; or with the use of the new &man.ddb.8;
utility. More details can be found in the &man.ddb.4; manual
- page. &merged;</para>
+ page.</para>
- <para>The kernel now supports a new textdump format of kernel
+ <para role="merged">The kernel now supports a new textdump format of kernel
dumps. A textdump provides higher-level information via
mechanically generated/extracted debugging output, rather than a
simple memory dump. This facility can be used to generate brief
kernel bug reports that are rich in debugging information, but
are not dependent on kernel symbol tables or precisely
synchronized source code. More information can be found in the
- &man.textdump.4; manual page. &merged;</para>
+ &man.textdump.4; manual page.</para>
<para>Kernel support for M:N threading has been removed. While
the KSE (Kernel Scheduled Entities) project was quite successful
@@ -181,39 +178,39 @@
interface for user applications to test the presence of
features.</para>
- <para>[&arch.amd64;] The &os; kernel now has support for large
+ <para arch="amd64">The &os; kernel now has support for large
memory page mappings (<quote>superpages</quote>).</para>
- <para>[&arch.amd64;, &arch.i386;, &arch.powerpc;] The ULE
+ <para arch="amd64,i386,ia64,powerpc" role="merged">The ULE
scheduler is now the default process scheduler
- in <filename>GENERIC</filename> kernels. &merged;</para>
+ in <filename>GENERIC</filename> kernels.</para>
<sect3 id="boot">
<title>Boot Loader Changes</title>
- <para>[&arch.amd64;, &arch.i386;] The BTX kernel used by the boot
+ <para arch="amd64,i386" role="merged">The BTX kernel used by the boot
loader has been changed to invoke BIOS routines from real
mode. This change makes it possible to boot &os; from USB
- devices. &merged;</para>
+ devices.</para>
- <para>[&arch.amd64;, &arch.i386;] A new gptboot boot loader has
+ <para arch="amd64,i386" role="merged">A new gptboot boot loader has
been added to support booting from a GPT labeled disk. A
new <command>boot</command> command has been added to
&man.gpt.8;, which makes a GPT disk bootable by writing the
required bits of the boot loader, creating a new boot
- partition if required. &merged;</para>
+ partition if required.</para>
</sect3>
<sect3 id="proc">
<title>Hardware Support</title>
- <para>The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
- PCMCIA smartcard readers, has been added. &merged;</para>
+ <para role="merged">The &man.cmx.4; driver, a driver for Omnikey CardMan 4040
+ PCMCIA smartcard readers, has been added.</para>
- <para>The &man.uslcom.4; driver, a driver for Silicon
+ <para role="merged">The &man.uslcom.4; driver, a driver for Silicon
Laboratories CP2101/CP2102-based USB serial adapters, has been
- imported from OpenBSD. &merged;</para>
+ imported from OpenBSD.</para>
<sect4 id="mm">
<title>Multimedia Support</title>
@@ -250,9 +247,8 @@
number of outstanding issues. It also now works on all
architectures.</para>
- <para>[&arch.amd64;, &arch.i386;] The &man.wpi.4; driver has
- been updated to include a number of stability fixes.
- &merged;</para>
+ <para arch="amd64,i386" role="merged">The &man.wpi.4; driver has
+ been updated to include a number of stability fixes.</para>
</sect4>
</sect3>
@@ -267,16 +263,16 @@
the <varname>net.bpf.zerocopy_enable</varname> sysctl
variable to <literal>1</literal>.</para>
- <para>A bug in TCP options padding, where the wrong padding
- bytes were used, has been fixed. &merged;</para>
+ <para role="merged">A bug in TCP options padding, where the wrong padding
+ bytes were used, has been fixed.</para>
</sect3>
<sect3 id="disks">
<title>Disks and Storage</title>
- <para>The &man.aac.4; driver now supports volumes larger than
- 2TB in size. &merged;</para>
+ <para role="merged">The &man.aac.4; driver now supports volumes larger than
+ 2TB in size.</para>
<para>The &man.ata.4; driver now supports a spindown command for
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon Apr 21 15:52:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id DA3751065675; Mon, 21 Apr 2008 15:52:23 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 9D1B61065673
for <perforce@FreeBSD.org>; Mon, 21 Apr 2008 15:52:23 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 79FEC8FC0C
for <perforce@FreeBSD.org>; Mon, 21 Apr 2008 15:52:23 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3LFqNH9007440
for <perforce@FreeBSD.org>; Mon, 21 Apr 2008 15:52:23 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3LFqMd2007438
for perforce@freebsd.org; Mon, 21 Apr 2008 15:52:22 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Mon, 21 Apr 2008 15:52:22 GMT
Message-Id: <200804211552.m3LFqMd2007438@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140358 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Apr 2008 15:52:24 -0000
http://perforce.freebsd.org/chv.cgi?CH=140358
Change 140358 by hselasky@hselasky_laptop001 on 2008/04/21 15:51:46
Set correct error variable.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#62 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/ohci.c#62 (text+ko) ====
@@ -882,7 +882,7 @@
if (temp > td->len) {
/* guard against corruption */
- td_flags = OHCI_TD_SET_CC(OHCI_CC_STALL);
+ cc = OHCI_CC_STALL;
} else if (xfer->aframes != xfer->nframes) {
/*
* subtract remaining length from
From owner-p4-projects@FreeBSD.ORG Mon Apr 21 17:21:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 071AC1065675; Mon, 21 Apr 2008 17:21:59 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id BCD131065673
for <perforce@freebsd.org>; Mon, 21 Apr 2008 17:21:58 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id B0DF98FC1A
for <perforce@freebsd.org>; Mon, 21 Apr 2008 17:21:58 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3LHLwNJ028112
for <perforce@freebsd.org>; Mon, 21 Apr 2008 17:21:58 GMT
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3LHLwl0028110
for perforce@freebsd.org; Mon, 21 Apr 2008 17:21:58 GMT
(envelope-from marcel@freebsd.org)
Date: Mon, 21 Apr 2008 17:21:58 GMT
Message-Id: <200804211721.m3LHLwl0028110@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140360 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Apr 2008 17:21:59 -0000
http://perforce.freebsd.org/chv.cgi?CH=140360
Change 140360 by marcel@marcel_xcllnt on 2008/04/21 17:21:05
IFC @140359
Affected files ...
.. //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate
.. //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#27 integrate
.. //depot/projects/ia64/sys/arm/conf/AVILA#8 integrate
.. //depot/projects/ia64/sys/arm/conf/BWCT#4 integrate
.. //depot/projects/ia64/sys/arm/conf/CRB#4 integrate
.. //depot/projects/ia64/sys/arm/conf/EP80219#6 integrate
.. //depot/projects/ia64/sys/arm/conf/HL200#4 integrate
.. //depot/projects/ia64/sys/arm/conf/IQ31244#13 integrate
.. //depot/projects/ia64/sys/arm/conf/KB920X#10 integrate
.. //depot/projects/ia64/sys/arm/conf/SIMICS#12 integrate
.. //depot/projects/ia64/sys/arm/conf/SKYEYE#6 integrate
.. //depot/projects/ia64/sys/conf/files#165 integrate
.. //depot/projects/ia64/sys/conf/files.amd64#51 integrate
.. //depot/projects/ia64/sys/conf/files.i386#90 integrate
.. //depot/projects/ia64/sys/conf/files.pc98#76 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-chipset.c#64 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.c#57 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-pci.h#42 integrate
.. //depot/projects/ia64/sys/dev/ata/ata-queue.c#32 integrate
.. //depot/projects/ia64/sys/ia64/conf/DEFAULTS#13 integrate
.. //depot/projects/ia64/sys/mips/conf/ADM5120#2 integrate
.. //depot/projects/ia64/sys/mips/conf/IDT#3 integrate
.. //depot/projects/ia64/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/ia64/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/ia64/sys/mips/conf/SENTRY5#2 integrate
.. //depot/projects/ia64/sys/netinet/ip_divert.c#43 integrate
.. //depot/projects/ia64/sys/netinet/raw_ip.c#57 integrate
.. //depot/projects/ia64/sys/netinet6/icmp6.c#38 integrate
.. //depot/projects/ia64/sys/netinet6/raw_ip6.c#33 integrate
.. //depot/projects/ia64/sys/powerpc/aim/clock.c#3 integrate
.. //depot/projects/ia64/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/ia64/sys/powerpc/conf/DEFAULTS#8 integrate
.. //depot/projects/ia64/sys/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/ia64/sys/sparc64/conf/GENERIC#71 integrate
.. //depot/projects/ia64/sys/sparc64/conf/NOTES#22 integrate
.. //depot/projects/ia64/sys/sun4v/conf/DEFAULTS#6 integrate
.. //depot/projects/ia64/sys/sun4v/conf/NOTES#6 integrate
.. //depot/projects/ia64/tools/tools/nanobsd/Files/root/save_cfg#1 branch
.. //depot/projects/ia64/usr.sbin/ancontrol/ancontrol.c#10 integrate
Differences ...
==== //depot/projects/ia64/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 (text+ko) ====
@@ -18,7 +18,7 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.329 2008/02/03 09:43:08 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.330 2008/04/21 05:43:07 brueffer Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -764,8 +764,6 @@
&hwlist.ath;
- &hwlist.awi;
-
&hwlist.cnw;
<para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network
==== //depot/projects/ia64/release/doc/share/misc/dev.archlist.txt#27 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.104 2008/03/11 08:28:44 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.105 2008/04/21 05:43:08 brueffer Exp $
#
#
@@ -47,7 +47,6 @@
asr i386
ath i386,pc98,amd64,sparc64
aue i386,pc98,ia64,amd64,powerpc
-awi i386,pc98,amd64
axe i386,pc98,amd64,powerpc
bce i386,amd64
bge i386,pc98,sparc64,ia64,amd64
==== //depot/projects/ia64/sys/arm/conf/AVILA#8 (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/arm/conf/AVILA,v 1.12 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.13 2008/04/21 10:09:54 phk Exp $
machine arm
ident AVILA
@@ -80,7 +80,6 @@
#options PREEMPTION
#options VERBOSE_SYSINIT
-device genclock
device mem # Memory and kernel memory devices
#device saarm
==== //depot/projects/ia64/sys/arm/conf/BWCT#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/BWCT,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident BWCT
@@ -68,7 +68,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device loop
device random
device ether
==== //depot/projects/ia64/sys/arm/conf/CRB#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CRB,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident CRB
@@ -65,7 +65,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/ia64/sys/arm/conf/EP80219#6 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/EP80219,v 1.7 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $
machine arm
ident EP80219
@@ -67,7 +67,6 @@
options BOOTP_WIRED_TO=fxp0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/ia64/sys/arm/conf/HL200#4 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/HL200,v 1.4 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident HL200
@@ -74,7 +74,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
==== //depot/projects/ia64/sys/arm/conf/IQ31244#13 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.21 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $
machine arm
ident IQ31244
@@ -64,7 +64,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/ia64/sys/arm/conf/KB920X#10 (text) ====
@@ -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/arm/conf/KB920X,v 1.16 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.17 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -62,7 +62,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
==== //depot/projects/ia64/sys/arm/conf/SIMICS#12 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.15 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $
machine arm
ident SIMICS
@@ -54,7 +54,6 @@
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-device genclock
device loop
device ether
device saip
==== //depot/projects/ia64/sys/arm/conf/SKYEYE#6 (text) ====
@@ -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/arm/conf/SKYEYE,v 1.9 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -59,7 +59,6 @@
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-device genclock
device loop
device ether
#device saarm
==== //depot/projects/ia64/sys/conf/files#165 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1293 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1425,7 +1425,7 @@
fs/cd9660/cd9660_vnops.c optional cd9660
fs/cd9660/cd9660_iconv.c optional cd9660_iconv
kern/bus_if.m standard
-kern/clock_if.m optional genclock
+kern/clock_if.m standard
kern/cpufreq_if.m standard
kern/device_if.m standard
kern/imgact_elf.c standard
@@ -1524,7 +1524,7 @@
kern/subr_prf.c standard
kern/subr_prof.c standard
kern/subr_rman.c standard
-kern/subr_rtc.c optional genclock
+kern/subr_rtc.c standard
kern/subr_sbuf.c standard
kern/subr_scanf.c standard
kern/subr_sleepqueue.c standard
==== //depot/projects/ia64/sys/conf/files.amd64#51 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.120 2008/04/14 07:59:59 phk Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.121 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -210,9 +210,7 @@
isa/atrtc.c standard
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
-kern/clock_if.m standard
kern/link_elf_obj.c standard
-kern/subr_rtc.c standard
#
# IA32 binary support
#
==== //depot/projects/ia64/sys/conf/files.i386#90 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.594 2008/04/14 07:59:59 phk Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.595 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -446,10 +446,8 @@
isa/atrtc.c standard
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
-kern/clock_if.m standard
kern/imgact_aout.c optional compat_aout
kern/imgact_gzip.c optional gzip
-kern/subr_rtc.c standard
libkern/divdi3.c standard
libkern/ffsl.c standard
libkern/flsl.c standard
==== //depot/projects/ia64/sys/conf/files.pc98#76 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.361 2008/04/19 08:18:47 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.362 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -314,10 +314,8 @@
i4b/layer1/itjc/i4b_itjc_l1.c optional itjc
i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc
#
-kern/clock_if.m standard
kern/imgact_aout.c optional compat_aout
kern/imgact_gzip.c optional gzip
-kern/subr_rtc.c standard
libkern/divdi3.c standard
libkern/ffsl.c standard
libkern/flsl.c standard
==== //depot/projects/ia64/sys/dev/ata/ata-chipset.c#64 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.217 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.219 2008/04/21 10:51:38 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -694,7 +694,7 @@
ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DHR));
/* enable FIS based switching */
- ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003);
+ //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003);
/* start operations on this channel */
ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset,
@@ -820,7 +820,7 @@
~ATA_AHCI_P_CMD_ATAPI);
/* set PM port to address */
- ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001);
+ //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001);
/* issue command to controller */
ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CI + offset, (1 << request->tag));
@@ -1638,6 +1638,27 @@
/*
+ * Adaptec chipset support functions
+ */
+int
+ata_adaptec_ident(device_t dev)
+{
+ struct ata_pci_controller *ctlr = device_get_softc(dev);
+ static struct ata_chip_id ids[] =
+ {{ ATA_ADAPTEC_1420, 0, 4, MV60XX, ATA_SA300, "1420SA" },
+ { 0, 0, 0, 0, 0, 0}};
+
+ if (!(ctlr->chip = ata_match_chip(dev, ids)))
+ return ENXIO;
+
+ ata_set_desc(dev);
+ ctlr->chipinit = ata_marvell_edma_chipinit;
+
+ return 0;
+}
+
+
+/*
* ATI chipset support functions
*/
int
==== //depot/projects/ia64/sys/dev/ata/ata-pci.c#57 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.126 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.127 2008/04/21 10:51:38 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -96,6 +96,10 @@
if (!ata_amd_ident(dev))
return ATA_PROBE_OK;
break;
+ case ATA_ADAPTEC_ID:
+ if (!ata_adaptec_ident(dev))
+ return ATA_PROBE_OK;
+ break;
case ATA_ATI_ID:
if (!ata_ati_ident(dev))
return ATA_PROBE_OK;
@@ -523,6 +527,7 @@
case ATA_ACARD_ID: return "Acard";
case ATA_ACER_LABS_ID: return "AcerLabs";
case ATA_AMD_ID: return "AMD";
+ case ATA_ADAPTEC_ID: return "Adaptec";
case ATA_ATI_ID: return "ATI";
case ATA_CYRIX_ID: return "Cyrix";
case ATA_CYPRESS_ID: return "Cypress";
==== //depot/projects/ia64/sys/dev/ata/ata-pci.h#42 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.85 2008/04/12 17:21:22 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.86 2008/04/21 10:51:38 sos Exp $
*/
/* structure holding chipset config info */
@@ -80,6 +80,14 @@
#define ATA_ATP865A 0x00081191
#define ATA_ATP865R 0x00091191
+#define ATA_ACER_LABS_ID 0x10b9
+#define ATA_ALI_1533 0x153310b9
+#define ATA_ALI_5229 0x522910b9
+#define ATA_ALI_5281 0x528110b9
+#define ATA_ALI_5287 0x528710b9
+#define ATA_ALI_5288 0x528810b9
+#define ATA_ALI_5289 0x528910b9
+
#define ATA_AMD_ID 0x1022
#define ATA_AMD755 0x74011022
#define ATA_AMD756 0x74091022
@@ -88,13 +96,8 @@
#define ATA_AMD8111 0x74691022
#define ATA_AMD5536 0x209a1022
-#define ATA_ACER_LABS_ID 0x10b9
-#define ATA_ALI_1533 0x153310b9
-#define ATA_ALI_5229 0x522910b9
-#define ATA_ALI_5281 0x528110b9
-#define ATA_ALI_5287 0x528710b9
-#define ATA_ALI_5288 0x528810b9
-#define ATA_ALI_5289 0x528910b9
+#define ATA_ADAPTEC_ID 0x9005
+#define ATA_ADAPTEC_1420 0x02419005
#define ATA_ATI_ID 0x1002
#define ATA_ATI_IXP200 0x43491002
@@ -471,6 +474,7 @@
int ata_acard_ident(device_t);
int ata_ali_ident(device_t);
int ata_amd_ident(device_t);
+int ata_adaptec_ident(device_t);
int ata_ati_ident(device_t);
int ata_cyrix_ident(device_t);
int ata_cypress_ident(device_t);
==== //depot/projects/ia64/sys/dev/ata/ata-queue.c#32 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.72 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.73 2008/04/21 10:35:19 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -503,6 +503,7 @@
request->flags |= ATA_R_TIMEOUT;
mtx_unlock(&ch->state_mtx);
ATA_LOCKING(ch->dev, ATA_LF_UNLOCK);
+ ch->dma.unload(request);
ata_finish(request);
}
else {
==== //depot/projects/ia64/sys/ia64/conf/DEFAULTS#13 (text+ko) ====
@@ -1,7 +1,7 @@
#
# DEFAULTS -- Default kernel configuration file for FreeBSD/ia64
#
-# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.14 2008/04/15 17:02:23 marcel Exp $
+# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.15 2008/04/21 10:09:54 phk Exp $
machine ia64
@@ -9,7 +9,6 @@
device acpi # ACPI support
# Pseudo devices.
-device genclock # Real-time clock
device mem # Memory and kernel memory devices
# UART chips on this platform
==== //depot/projects/ia64/sys/mips/conf/ADM5120#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.2 2008/04/13 22:04:56 imp Exp $
+# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.3 2008/04/21 10:09:54 phk Exp $
machine mips
ident ADM5120
@@ -62,7 +62,6 @@
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device genclock
device loop
device ether
device uart
==== //depot/projects/ia64/sys/mips/conf/IDT#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/mips/conf/IDT,v 1.2 2008/04/20 20:35:39 sam Exp $
+# $FreeBSD: src/sys/mips/conf/IDT,v 1.3 2008/04/21 10:09:54 phk Exp $
machine mips
cpu CPU_MIPS4KC
@@ -31,7 +31,6 @@
options INVARIANTS #Enable calls of extra sanity checking
options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-device genclock
device loop
device pci
device ether
==== //depot/projects/ia64/sys/mips/conf/MALTA#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/mips/conf/MALTA,v 1.2 2008/04/13 22:04:56 imp Exp $
+# $FreeBSD: src/sys/mips/conf/MALTA,v 1.3 2008/04/21 10:09:54 phk Exp $
machine mips
ident MALTA
@@ -61,7 +61,6 @@
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device genclock
device loop
device ether
device le
==== //depot/projects/ia64/sys/mips/conf/QEMU#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/mips/conf/QEMU,v 1.1 2008/04/13 07:07:57 imp Exp $
+# $FreeBSD: src/sys/mips/conf/QEMU,v 1.2 2008/04/21 10:09:54 phk Exp $
machine mips
cpu CPU_MIPS32
@@ -51,7 +51,6 @@
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device genclock
device loop
device ether
device mem
==== //depot/projects/ia64/sys/mips/conf/SENTRY5#2 (text) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.2 2008/04/15 02:09:28 imp Exp $
+# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.3 2008/04/21 10:09:54 phk Exp $
#
# The Broadcom Sentry5 series of processors and boards is very commonly
# used in COTS hardware including the Netgear WGT634U.
@@ -91,7 +91,6 @@
#device uart
#device uart_ns8250
-device genclock
device loop
device ether
device md
==== //depot/projects/ia64/sys/netinet/ip_divert.c#43 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.132 2008/04/17 21:38:16 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.133 2008/04/21 12:03:59 rwatson Exp $");
#if !defined(KLD_MODULE)
#include "opt_inet.h"
@@ -268,7 +268,7 @@
nport = htons((u_int16_t)divert_info(mtag));
INP_INFO_RLOCK(&divcbinfo);
LIST_FOREACH(inp, &divcb, inp_list) {
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
/* XXX why does only one socket match? */
if (inp->inp_lport == nport) {
sa = inp->inp_socket;
@@ -280,10 +280,10 @@
sa = NULL; /* force mbuf reclaim below */
} else
sorwakeup_locked(sa);
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
break;
}
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
INP_INFO_RUNLOCK(&divcbinfo);
if (sa == NULL) {
@@ -356,7 +356,7 @@
dt->info |= IP_FW_DIVERT_OUTPUT_FLAG;
INP_INFO_WLOCK(&divcbinfo);
inp = sotoinpcb(so);
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
/*
* Don't allow both user specified and setsockopt options,
* and don't allow packet length sizes that will crash
@@ -364,7 +364,7 @@
if (((ip->ip_hl != (sizeof (*ip) >> 2)) && inp->inp_options) ||
((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) {
error = EINVAL;
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
INP_INFO_WUNLOCK(&divcbinfo);
m_freem(m);
} else {
@@ -405,7 +405,7 @@
if (options == NULL)
error = ENOBUFS;
}
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
INP_INFO_WUNLOCK(&divcbinfo);
if (error == ENOBUFS) {
m_freem(m);
@@ -615,11 +615,11 @@
INP_INFO_RLOCK(&divcbinfo);
for (inp = LIST_FIRST(divcbinfo.ipi_listhead), i = 0; inp && i < n;
inp = LIST_NEXT(inp, inp_list)) {
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_gencnt <= gencnt &&
cr_canseesocket(req->td->td_ucred, inp->inp_socket) == 0)
inp_list[i++] = inp;
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
INP_INFO_RUNLOCK(&divcbinfo);
n = i;
@@ -627,7 +627,7 @@
error = 0;
for (i = 0; i < n; i++) {
inp = inp_list[i];
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_gencnt <= gencnt) {
struct xinpcb xi;
bzero(&xi, sizeof(xi));
@@ -636,10 +636,10 @@
bcopy(inp, &xi.xi_inp, sizeof *inp);
if (inp->inp_socket)
sotoxsocket(inp->inp_socket, &xi.xi_socket);
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
error = SYSCTL_OUT(req, &xi, sizeof xi);
} else
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
if (!error) {
/*
==== //depot/projects/ia64/sys/netinet/raw_ip.c#57 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.182 2008/04/17 21:38:16 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.183 2008/04/21 12:06:41 rwatson Exp $");
#include "opt_inet6.h"
#include "opt_ipsec.h"
@@ -155,7 +155,7 @@
{
int policyfail = 0;
- INP_WLOCK_ASSERT(last);
+ INP_RLOCK_ASSERT(last);
#ifdef IPSEC
/* check AH/ESP integrity. */
@@ -209,10 +209,10 @@
ripsrc.sin_addr = ip->ip_src;
last = NULL;
LIST_FOREACH(inp, &ripcb, inp_list) {
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_ip_p && inp->inp_ip_p != proto) {
docontinue:
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
continue;
}
#ifdef INET6
@@ -236,14 +236,14 @@
if (n != NULL)
(void) raw_append(last, ip, n);
/* XXX count dropped packet */
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
}
last = inp;
}
if (last != NULL) {
if (raw_append(last, ip, m) != 0)
ipstat.ips_delivered--;
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
} else {
m_freem(m);
ipstat.ips_noproto++;
@@ -278,7 +278,7 @@
if (m == NULL)
return(ENOBUFS);
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
ip = mtod(m, struct ip *);
ip->ip_tos = inp->inp_ip_tos;
if (inp->inp_flags & INP_DONTFRAG)
@@ -299,12 +299,12 @@
m_freem(m);
return(EMSGSIZE);
}
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
ip = mtod(m, struct ip *);
if (jailed(inp->inp_socket->so_cred)) {
if (ip->ip_src.s_addr !=
htonl(prison_getip(inp->inp_socket->so_cred))) {
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
m_freem(m);
return (EPERM);
}
@@ -315,7 +315,7 @@
&& inp->inp_options)
|| (ip->ip_len > m->m_pkthdr.len)
|| (ip->ip_len < (ip->ip_hl << 2))) {
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
m_freem(m);
return EINVAL;
}
@@ -335,7 +335,7 @@
error = ip_output(m, inp->inp_options, NULL, flags,
inp->inp_moptions, inp);
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
return error;
}
@@ -851,13 +851,13 @@
INP_INFO_RLOCK(&ripcbinfo);
for (inp = LIST_FIRST(ripcbinfo.ipi_listhead), i = 0; inp && i < n;
inp = LIST_NEXT(inp, inp_list)) {
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_gencnt <= gencnt &&
cr_canseesocket(req->td->td_ucred, inp->inp_socket) == 0) {
/* XXX held references? */
inp_list[i++] = inp;
}
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
INP_INFO_RUNLOCK(&ripcbinfo);
n = i;
@@ -865,7 +865,7 @@
error = 0;
for (i = 0; i < n; i++) {
inp = inp_list[i];
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_gencnt <= gencnt) {
struct xinpcb xi;
bzero(&xi, sizeof(xi));
@@ -874,10 +874,10 @@
bcopy(inp, &xi.xi_inp, sizeof *inp);
if (inp->inp_socket)
sotoxsocket(inp->inp_socket, &xi.xi_socket);
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
error = SYSCTL_OUT(req, &xi, sizeof xi);
} else
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
if (!error) {
/*
==== //depot/projects/ia64/sys/netinet6/icmp6.c#38 (text+ko) ====
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.83 2008/04/17 21:38:17 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.84 2008/04/21 12:08:40 rwatson Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1891,10 +1891,10 @@
INP_INFO_RLOCK(&ripcbinfo);
LIST_FOREACH(in6p, &ripcb, inp_list) {
- INP_WLOCK(in6p);
+ INP_RLOCK(in6p);
if ((in6p->inp_vflag & INP_IPV6) == 0) {
docontinue:
- INP_WUNLOCK(in6p);
+ INP_RUNLOCK(in6p);
continue;
}
if (in6p->in6p_ip6_nxt != IPPROTO_ICMPV6)
@@ -1965,7 +1965,7 @@
sorwakeup_locked(last->in6p_socket);
opts = NULL;
}
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
}
last = in6p;
}
@@ -2003,7 +2003,7 @@
SOCKBUF_UNLOCK(&last->in6p_socket->so_rcv);
} else
sorwakeup_locked(last->in6p_socket);
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
} else {
m_freem(m);
ip6stat.ip6s_delivered--;
==== //depot/projects/ia64/sys/netinet6/raw_ip6.c#33 (text+ko) ====
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.77 2008/04/17 21:38:17 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.78 2008/04/21 12:06:41 rwatson Exp $");
#include "opt_ipsec.h"
#include "opt_inet6.h"
@@ -154,10 +154,10 @@
INP_INFO_RLOCK(&ripcbinfo);
LIST_FOREACH(in6p, &ripcb, inp_list) {
- INP_WLOCK(in6p);
+ INP_RLOCK(in6p);
if ((in6p->in6p_vflag & INP_IPV6) == 0) {
docontinue:
- INP_WUNLOCK(in6p);
+ INP_RUNLOCK(in6p);
continue;
}
if (in6p->in6p_ip6_nxt &&
@@ -207,7 +207,7 @@
sorwakeup(last->in6p_socket);
opts = NULL;
}
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
}
last = in6p;
}
@@ -220,7 +220,7 @@
ipsec6stat.in_polvio++;
ip6stat.ip6s_delivered--;
/* do not inject data into pcb */
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
} else
#endif /* IPSEC */
if (last) {
@@ -237,7 +237,7 @@
rip6stat.rip6s_fullsock++;
} else
sorwakeup(last->in6p_socket);
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
} else {
rip6stat.rip6s_nosock++;
if (m->m_flags & M_MCAST)
==== //depot/projects/ia64/sys/powerpc/aim/clock.c#3 (text+ko) ====
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.31 2008/03/26 20:09:20 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.32 2008/04/21 04:41:37 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -83,10 +83,6 @@
static long ticks_per_intr;
static volatile u_long lasttb;
-#define DIFF19041970 2082844800
-
-static int clockinitted = 0;
-
static timecounter_get_t decr_get_timecount;
static struct timecounter decr_timecounter = {
@@ -98,70 +94,6 @@
};
void
-inittodr(time_t base)
-{
- time_t deltat;
- u_int rtc_time;
- struct timespec ts;
- phandle_t phandle;
- ihandle_t ihandle;
- char rtcpath[128];
- u_int rtcsecs;
-
- /*
- * If we can't read from RTC, use the fs time.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon Apr 21 17:23:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 2A3D11065670; Mon, 21 Apr 2008 17:23:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id DF490106566B
for <perforce@freebsd.org>; Mon, 21 Apr 2008 17:22:59 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id D34B98FC23
for <perforce@freebsd.org>; Mon, 21 Apr 2008 17:22:59 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3LHMxML028199
for <perforce@freebsd.org>; Mon, 21 Apr 2008 17:22:59 GMT
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3LHMxlK028197
for perforce@freebsd.org; Mon, 21 Apr 2008 17:22:59 GMT
(envelope-from marcel@freebsd.org)
Date: Mon, 21 Apr 2008 17:22:59 GMT
Message-Id: <200804211722.m3LHMxlK028197@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140361 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Apr 2008 17:23:00 -0000
http://perforce.freebsd.org/chv.cgi?CH=140361
Change 140361 by marcel@marcel_xcllnt on 2008/04/21 17:22:17
IFC @140359
Affected files ...
.. //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 integrate
.. //depot/projects/powerpc/release/doc/share/misc/dev.archlist.txt#12 integrate
.. //depot/projects/powerpc/sys/arm/conf/AVILA#10 integrate
.. //depot/projects/powerpc/sys/arm/conf/BWCT#4 integrate
.. //depot/projects/powerpc/sys/arm/conf/CRB#5 integrate
.. //depot/projects/powerpc/sys/arm/conf/EP80219#5 integrate
.. //depot/projects/powerpc/sys/arm/conf/HL200#4 integrate
.. //depot/projects/powerpc/sys/arm/conf/IQ31244#5 integrate
.. //depot/projects/powerpc/sys/arm/conf/KB920X#7 integrate
.. //depot/projects/powerpc/sys/arm/conf/SIMICS#5 integrate
.. //depot/projects/powerpc/sys/arm/conf/SKYEYE#4 integrate
.. //depot/projects/powerpc/sys/conf/files#30 integrate
.. //depot/projects/powerpc/sys/conf/files.amd64#12 integrate
.. //depot/projects/powerpc/sys/conf/files.i386#16 integrate
.. //depot/projects/powerpc/sys/conf/files.pc98#13 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#13 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-pci.c#11 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-pci.h#10 integrate
.. //depot/projects/powerpc/sys/dev/ata/ata-queue.c#7 integrate
.. //depot/projects/powerpc/sys/ia64/conf/DEFAULTS#7 integrate
.. //depot/projects/powerpc/sys/mips/conf/ADM5120#2 integrate
.. //depot/projects/powerpc/sys/mips/conf/IDT#3 integrate
.. //depot/projects/powerpc/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/powerpc/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/powerpc/sys/mips/conf/SENTRY5#2 integrate
.. //depot/projects/powerpc/sys/netinet/ip_divert.c#10 integrate
.. //depot/projects/powerpc/sys/netinet/raw_ip.c#11 integrate
.. //depot/projects/powerpc/sys/netinet6/icmp6.c#13 integrate
.. //depot/projects/powerpc/sys/netinet6/raw_ip6.c#12 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/clock.c#4 integrate
.. //depot/projects/powerpc/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/powerpc/sys/powerpc/conf/DEFAULTS#5 integrate
.. //depot/projects/powerpc/sys/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/powerpc/sys/sparc64/conf/GENERIC#16 integrate
.. //depot/projects/powerpc/sys/sparc64/conf/NOTES#2 integrate
.. //depot/projects/powerpc/sys/sun4v/conf/DEFAULTS#3 integrate
.. //depot/projects/powerpc/sys/sun4v/conf/NOTES#2 integrate
.. //depot/projects/powerpc/tools/tools/nanobsd/Files/root/save_cfg#1 branch
.. //depot/projects/powerpc/usr.sbin/ancontrol/ancontrol.c#2 integrate
Differences ...
==== //depot/projects/powerpc/release/doc/en_US.ISO8859-1/hardware/article.sgml#8 (text+ko) ====
@@ -18,7 +18,7 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.329 2008/02/03 09:43:08 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.330 2008/04/21 05:43:07 brueffer Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -764,8 +764,6 @@
&hwlist.ath;
- &hwlist.awi;
-
&hwlist.cnw;
<para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network
==== //depot/projects/powerpc/release/doc/share/misc/dev.archlist.txt#12 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.104 2008/03/11 08:28:44 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.105 2008/04/21 05:43:08 brueffer Exp $
#
#
@@ -47,7 +47,6 @@
asr i386
ath i386,pc98,amd64,sparc64
aue i386,pc98,ia64,amd64,powerpc
-awi i386,pc98,amd64
axe i386,pc98,amd64,powerpc
bce i386,amd64
bge i386,pc98,sparc64,ia64,amd64
==== //depot/projects/powerpc/sys/arm/conf/AVILA#10 (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/arm/conf/AVILA,v 1.12 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.13 2008/04/21 10:09:54 phk Exp $
machine arm
ident AVILA
@@ -80,7 +80,6 @@
#options PREEMPTION
#options VERBOSE_SYSINIT
-device genclock
device mem # Memory and kernel memory devices
#device saarm
==== //depot/projects/powerpc/sys/arm/conf/BWCT#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/BWCT,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident BWCT
@@ -68,7 +68,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device loop
device random
device ether
==== //depot/projects/powerpc/sys/arm/conf/CRB#5 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CRB,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident CRB
@@ -65,7 +65,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/powerpc/sys/arm/conf/EP80219#5 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/EP80219,v 1.7 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $
machine arm
ident EP80219
@@ -67,7 +67,6 @@
options BOOTP_WIRED_TO=fxp0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/powerpc/sys/arm/conf/HL200#4 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/HL200,v 1.4 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident HL200
@@ -74,7 +74,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
==== //depot/projects/powerpc/sys/arm/conf/IQ31244#5 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.21 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $
machine arm
ident IQ31244
@@ -64,7 +64,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/powerpc/sys/arm/conf/KB920X#7 (text) ====
@@ -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/arm/conf/KB920X,v 1.16 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.17 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -62,7 +62,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
==== //depot/projects/powerpc/sys/arm/conf/SIMICS#5 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.15 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $
machine arm
ident SIMICS
@@ -54,7 +54,6 @@
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-device genclock
device loop
device ether
device saip
==== //depot/projects/powerpc/sys/arm/conf/SKYEYE#4 (text) ====
@@ -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/arm/conf/SKYEYE,v 1.9 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -59,7 +59,6 @@
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-device genclock
device loop
device ether
#device saarm
==== //depot/projects/powerpc/sys/conf/files#30 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1293 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1425,7 +1425,7 @@
fs/cd9660/cd9660_vnops.c optional cd9660
fs/cd9660/cd9660_iconv.c optional cd9660_iconv
kern/bus_if.m standard
-kern/clock_if.m optional genclock
+kern/clock_if.m standard
kern/cpufreq_if.m standard
kern/device_if.m standard
kern/imgact_elf.c standard
@@ -1524,7 +1524,7 @@
kern/subr_prf.c standard
kern/subr_prof.c standard
kern/subr_rman.c standard
-kern/subr_rtc.c optional genclock
+kern/subr_rtc.c standard
kern/subr_sbuf.c standard
kern/subr_scanf.c standard
kern/subr_sleepqueue.c standard
==== //depot/projects/powerpc/sys/conf/files.amd64#12 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.120 2008/04/14 07:59:59 phk Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.121 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -210,9 +210,7 @@
isa/atrtc.c standard
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
-kern/clock_if.m standard
kern/link_elf_obj.c standard
-kern/subr_rtc.c standard
#
# IA32 binary support
#
==== //depot/projects/powerpc/sys/conf/files.i386#16 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.594 2008/04/14 07:59:59 phk Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.595 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -446,10 +446,8 @@
isa/atrtc.c standard
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
-kern/clock_if.m standard
kern/imgact_aout.c optional compat_aout
kern/imgact_gzip.c optional gzip
-kern/subr_rtc.c standard
libkern/divdi3.c standard
libkern/ffsl.c standard
libkern/flsl.c standard
==== //depot/projects/powerpc/sys/conf/files.pc98#13 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.361 2008/04/19 08:18:47 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.362 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -314,10 +314,8 @@
i4b/layer1/itjc/i4b_itjc_l1.c optional itjc
i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc
#
-kern/clock_if.m standard
kern/imgact_aout.c optional compat_aout
kern/imgact_gzip.c optional gzip
-kern/subr_rtc.c standard
libkern/divdi3.c standard
libkern/ffsl.c standard
libkern/flsl.c standard
==== //depot/projects/powerpc/sys/dev/ata/ata-chipset.c#13 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.217 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.219 2008/04/21 10:51:38 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -694,7 +694,7 @@
ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DHR));
/* enable FIS based switching */
- ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003);
+ //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003);
/* start operations on this channel */
ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset,
@@ -820,7 +820,7 @@
~ATA_AHCI_P_CMD_ATAPI);
/* set PM port to address */
- ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001);
+ //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001);
/* issue command to controller */
ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CI + offset, (1 << request->tag));
@@ -1638,6 +1638,27 @@
/*
+ * Adaptec chipset support functions
+ */
+int
+ata_adaptec_ident(device_t dev)
+{
+ struct ata_pci_controller *ctlr = device_get_softc(dev);
+ static struct ata_chip_id ids[] =
+ {{ ATA_ADAPTEC_1420, 0, 4, MV60XX, ATA_SA300, "1420SA" },
+ { 0, 0, 0, 0, 0, 0}};
+
+ if (!(ctlr->chip = ata_match_chip(dev, ids)))
+ return ENXIO;
+
+ ata_set_desc(dev);
+ ctlr->chipinit = ata_marvell_edma_chipinit;
+
+ return 0;
+}
+
+
+/*
* ATI chipset support functions
*/
int
==== //depot/projects/powerpc/sys/dev/ata/ata-pci.c#11 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.126 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.127 2008/04/21 10:51:38 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -96,6 +96,10 @@
if (!ata_amd_ident(dev))
return ATA_PROBE_OK;
break;
+ case ATA_ADAPTEC_ID:
+ if (!ata_adaptec_ident(dev))
+ return ATA_PROBE_OK;
+ break;
case ATA_ATI_ID:
if (!ata_ati_ident(dev))
return ATA_PROBE_OK;
@@ -523,6 +527,7 @@
case ATA_ACARD_ID: return "Acard";
case ATA_ACER_LABS_ID: return "AcerLabs";
case ATA_AMD_ID: return "AMD";
+ case ATA_ADAPTEC_ID: return "Adaptec";
case ATA_ATI_ID: return "ATI";
case ATA_CYRIX_ID: return "Cyrix";
case ATA_CYPRESS_ID: return "Cypress";
==== //depot/projects/powerpc/sys/dev/ata/ata-pci.h#10 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.85 2008/04/12 17:21:22 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.86 2008/04/21 10:51:38 sos Exp $
*/
/* structure holding chipset config info */
@@ -80,6 +80,14 @@
#define ATA_ATP865A 0x00081191
#define ATA_ATP865R 0x00091191
+#define ATA_ACER_LABS_ID 0x10b9
+#define ATA_ALI_1533 0x153310b9
+#define ATA_ALI_5229 0x522910b9
+#define ATA_ALI_5281 0x528110b9
+#define ATA_ALI_5287 0x528710b9
+#define ATA_ALI_5288 0x528810b9
+#define ATA_ALI_5289 0x528910b9
+
#define ATA_AMD_ID 0x1022
#define ATA_AMD755 0x74011022
#define ATA_AMD756 0x74091022
@@ -88,13 +96,8 @@
#define ATA_AMD8111 0x74691022
#define ATA_AMD5536 0x209a1022
-#define ATA_ACER_LABS_ID 0x10b9
-#define ATA_ALI_1533 0x153310b9
-#define ATA_ALI_5229 0x522910b9
-#define ATA_ALI_5281 0x528110b9
-#define ATA_ALI_5287 0x528710b9
-#define ATA_ALI_5288 0x528810b9
-#define ATA_ALI_5289 0x528910b9
+#define ATA_ADAPTEC_ID 0x9005
+#define ATA_ADAPTEC_1420 0x02419005
#define ATA_ATI_ID 0x1002
#define ATA_ATI_IXP200 0x43491002
@@ -471,6 +474,7 @@
int ata_acard_ident(device_t);
int ata_ali_ident(device_t);
int ata_amd_ident(device_t);
+int ata_adaptec_ident(device_t);
int ata_ati_ident(device_t);
int ata_cyrix_ident(device_t);
int ata_cypress_ident(device_t);
==== //depot/projects/powerpc/sys/dev/ata/ata-queue.c#7 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.72 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-queue.c,v 1.73 2008/04/21 10:35:19 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -503,6 +503,7 @@
request->flags |= ATA_R_TIMEOUT;
mtx_unlock(&ch->state_mtx);
ATA_LOCKING(ch->dev, ATA_LF_UNLOCK);
+ ch->dma.unload(request);
ata_finish(request);
}
else {
==== //depot/projects/powerpc/sys/ia64/conf/DEFAULTS#7 (text+ko) ====
@@ -1,7 +1,7 @@
#
# DEFAULTS -- Default kernel configuration file for FreeBSD/ia64
#
-# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.14 2008/04/15 17:02:23 marcel Exp $
+# $FreeBSD: src/sys/ia64/conf/DEFAULTS,v 1.15 2008/04/21 10:09:54 phk Exp $
machine ia64
@@ -9,7 +9,6 @@
device acpi # ACPI support
# Pseudo devices.
-device genclock # Real-time clock
device mem # Memory and kernel memory devices
# UART chips on this platform
==== //depot/projects/powerpc/sys/mips/conf/ADM5120#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.2 2008/04/13 22:04:56 imp Exp $
+# $FreeBSD: src/sys/mips/conf/ADM5120,v 1.3 2008/04/21 10:09:54 phk Exp $
machine mips
ident ADM5120
@@ -62,7 +62,6 @@
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device genclock
device loop
device ether
device uart
==== //depot/projects/powerpc/sys/mips/conf/IDT#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/mips/conf/IDT,v 1.2 2008/04/20 20:35:39 sam Exp $
+# $FreeBSD: src/sys/mips/conf/IDT,v 1.3 2008/04/21 10:09:54 phk Exp $
machine mips
cpu CPU_MIPS4KC
@@ -31,7 +31,6 @@
options INVARIANTS #Enable calls of extra sanity checking
options INVARIANT_SUPPORT #Extra sanity checks of internal structures, required by INVARIANTS
-device genclock
device loop
device pci
device ether
==== //depot/projects/powerpc/sys/mips/conf/MALTA#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/mips/conf/MALTA,v 1.2 2008/04/13 22:04:56 imp Exp $
+# $FreeBSD: src/sys/mips/conf/MALTA,v 1.3 2008/04/21 10:09:54 phk Exp $
machine mips
ident MALTA
@@ -61,7 +61,6 @@
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device genclock
device loop
device ether
device le
==== //depot/projects/powerpc/sys/mips/conf/QEMU#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/mips/conf/QEMU,v 1.1 2008/04/13 07:07:57 imp Exp $
+# $FreeBSD: src/sys/mips/conf/QEMU,v 1.2 2008/04/21 10:09:54 phk Exp $
machine mips
cpu CPU_MIPS32
@@ -51,7 +51,6 @@
#options WITNESS #Enable checks to detect deadlocks and cycles
#options WITNESS_SKIPSPIN #Don't run witness on spinlocks for speed
-device genclock
device loop
device ether
device mem
==== //depot/projects/powerpc/sys/mips/conf/SENTRY5#2 (text) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.2 2008/04/15 02:09:28 imp Exp $
+# $FreeBSD: src/sys/mips/conf/SENTRY5,v 1.3 2008/04/21 10:09:54 phk Exp $
#
# The Broadcom Sentry5 series of processors and boards is very commonly
# used in COTS hardware including the Netgear WGT634U.
@@ -91,7 +91,6 @@
#device uart
#device uart_ns8250
-device genclock
device loop
device ether
device md
==== //depot/projects/powerpc/sys/netinet/ip_divert.c#10 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.132 2008/04/17 21:38:16 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_divert.c,v 1.133 2008/04/21 12:03:59 rwatson Exp $");
#if !defined(KLD_MODULE)
#include "opt_inet.h"
@@ -268,7 +268,7 @@
nport = htons((u_int16_t)divert_info(mtag));
INP_INFO_RLOCK(&divcbinfo);
LIST_FOREACH(inp, &divcb, inp_list) {
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
/* XXX why does only one socket match? */
if (inp->inp_lport == nport) {
sa = inp->inp_socket;
@@ -280,10 +280,10 @@
sa = NULL; /* force mbuf reclaim below */
} else
sorwakeup_locked(sa);
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
break;
}
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
INP_INFO_RUNLOCK(&divcbinfo);
if (sa == NULL) {
@@ -356,7 +356,7 @@
dt->info |= IP_FW_DIVERT_OUTPUT_FLAG;
INP_INFO_WLOCK(&divcbinfo);
inp = sotoinpcb(so);
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
/*
* Don't allow both user specified and setsockopt options,
* and don't allow packet length sizes that will crash
@@ -364,7 +364,7 @@
if (((ip->ip_hl != (sizeof (*ip) >> 2)) && inp->inp_options) ||
((u_short)ntohs(ip->ip_len) > m->m_pkthdr.len)) {
error = EINVAL;
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
INP_INFO_WUNLOCK(&divcbinfo);
m_freem(m);
} else {
@@ -405,7 +405,7 @@
if (options == NULL)
error = ENOBUFS;
}
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
INP_INFO_WUNLOCK(&divcbinfo);
if (error == ENOBUFS) {
m_freem(m);
@@ -615,11 +615,11 @@
INP_INFO_RLOCK(&divcbinfo);
for (inp = LIST_FIRST(divcbinfo.ipi_listhead), i = 0; inp && i < n;
inp = LIST_NEXT(inp, inp_list)) {
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_gencnt <= gencnt &&
cr_canseesocket(req->td->td_ucred, inp->inp_socket) == 0)
inp_list[i++] = inp;
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
INP_INFO_RUNLOCK(&divcbinfo);
n = i;
@@ -627,7 +627,7 @@
error = 0;
for (i = 0; i < n; i++) {
inp = inp_list[i];
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_gencnt <= gencnt) {
struct xinpcb xi;
bzero(&xi, sizeof(xi));
@@ -636,10 +636,10 @@
bcopy(inp, &xi.xi_inp, sizeof *inp);
if (inp->inp_socket)
sotoxsocket(inp->inp_socket, &xi.xi_socket);
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
error = SYSCTL_OUT(req, &xi, sizeof xi);
} else
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
if (!error) {
/*
==== //depot/projects/powerpc/sys/netinet/raw_ip.c#11 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.182 2008/04/17 21:38:16 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/raw_ip.c,v 1.183 2008/04/21 12:06:41 rwatson Exp $");
#include "opt_inet6.h"
#include "opt_ipsec.h"
@@ -155,7 +155,7 @@
{
int policyfail = 0;
- INP_WLOCK_ASSERT(last);
+ INP_RLOCK_ASSERT(last);
#ifdef IPSEC
/* check AH/ESP integrity. */
@@ -209,10 +209,10 @@
ripsrc.sin_addr = ip->ip_src;
last = NULL;
LIST_FOREACH(inp, &ripcb, inp_list) {
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_ip_p && inp->inp_ip_p != proto) {
docontinue:
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
continue;
}
#ifdef INET6
@@ -236,14 +236,14 @@
if (n != NULL)
(void) raw_append(last, ip, n);
/* XXX count dropped packet */
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
}
last = inp;
}
if (last != NULL) {
if (raw_append(last, ip, m) != 0)
ipstat.ips_delivered--;
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
} else {
m_freem(m);
ipstat.ips_noproto++;
@@ -278,7 +278,7 @@
if (m == NULL)
return(ENOBUFS);
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
ip = mtod(m, struct ip *);
ip->ip_tos = inp->inp_ip_tos;
if (inp->inp_flags & INP_DONTFRAG)
@@ -299,12 +299,12 @@
m_freem(m);
return(EMSGSIZE);
}
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
ip = mtod(m, struct ip *);
if (jailed(inp->inp_socket->so_cred)) {
if (ip->ip_src.s_addr !=
htonl(prison_getip(inp->inp_socket->so_cred))) {
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
m_freem(m);
return (EPERM);
}
@@ -315,7 +315,7 @@
&& inp->inp_options)
|| (ip->ip_len > m->m_pkthdr.len)
|| (ip->ip_len < (ip->ip_hl << 2))) {
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
m_freem(m);
return EINVAL;
}
@@ -335,7 +335,7 @@
error = ip_output(m, inp->inp_options, NULL, flags,
inp->inp_moptions, inp);
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
return error;
}
@@ -851,13 +851,13 @@
INP_INFO_RLOCK(&ripcbinfo);
for (inp = LIST_FIRST(ripcbinfo.ipi_listhead), i = 0; inp && i < n;
inp = LIST_NEXT(inp, inp_list)) {
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_gencnt <= gencnt &&
cr_canseesocket(req->td->td_ucred, inp->inp_socket) == 0) {
/* XXX held references? */
inp_list[i++] = inp;
}
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
INP_INFO_RUNLOCK(&ripcbinfo);
n = i;
@@ -865,7 +865,7 @@
error = 0;
for (i = 0; i < n; i++) {
inp = inp_list[i];
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_gencnt <= gencnt) {
struct xinpcb xi;
bzero(&xi, sizeof(xi));
@@ -874,10 +874,10 @@
bcopy(inp, &xi.xi_inp, sizeof *inp);
if (inp->inp_socket)
sotoxsocket(inp->inp_socket, &xi.xi_socket);
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
error = SYSCTL_OUT(req, &xi, sizeof xi);
} else
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
}
if (!error) {
/*
==== //depot/projects/powerpc/sys/netinet6/icmp6.c#13 (text+ko) ====
@@ -61,7 +61,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.83 2008/04/17 21:38:17 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/icmp6.c,v 1.84 2008/04/21 12:08:40 rwatson Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -1891,10 +1891,10 @@
INP_INFO_RLOCK(&ripcbinfo);
LIST_FOREACH(in6p, &ripcb, inp_list) {
- INP_WLOCK(in6p);
+ INP_RLOCK(in6p);
if ((in6p->inp_vflag & INP_IPV6) == 0) {
docontinue:
- INP_WUNLOCK(in6p);
+ INP_RUNLOCK(in6p);
continue;
}
if (in6p->in6p_ip6_nxt != IPPROTO_ICMPV6)
@@ -1965,7 +1965,7 @@
sorwakeup_locked(last->in6p_socket);
opts = NULL;
}
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
}
last = in6p;
}
@@ -2003,7 +2003,7 @@
SOCKBUF_UNLOCK(&last->in6p_socket->so_rcv);
} else
sorwakeup_locked(last->in6p_socket);
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
} else {
m_freem(m);
ip6stat.ip6s_delivered--;
==== //depot/projects/powerpc/sys/netinet6/raw_ip6.c#12 (text+ko) ====
@@ -59,7 +59,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.77 2008/04/17 21:38:17 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/raw_ip6.c,v 1.78 2008/04/21 12:06:41 rwatson Exp $");
#include "opt_ipsec.h"
#include "opt_inet6.h"
@@ -154,10 +154,10 @@
INP_INFO_RLOCK(&ripcbinfo);
LIST_FOREACH(in6p, &ripcb, inp_list) {
- INP_WLOCK(in6p);
+ INP_RLOCK(in6p);
if ((in6p->in6p_vflag & INP_IPV6) == 0) {
docontinue:
- INP_WUNLOCK(in6p);
+ INP_RUNLOCK(in6p);
continue;
}
if (in6p->in6p_ip6_nxt &&
@@ -207,7 +207,7 @@
sorwakeup(last->in6p_socket);
opts = NULL;
}
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
}
last = in6p;
}
@@ -220,7 +220,7 @@
ipsec6stat.in_polvio++;
ip6stat.ip6s_delivered--;
/* do not inject data into pcb */
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
} else
#endif /* IPSEC */
if (last) {
@@ -237,7 +237,7 @@
rip6stat.rip6s_fullsock++;
} else
sorwakeup(last->in6p_socket);
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
} else {
rip6stat.rip6s_nosock++;
if (m->m_flags & M_MCAST)
==== //depot/projects/powerpc/sys/powerpc/aim/clock.c#4 (text+ko) ====
@@ -56,7 +56,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.31 2008/03/26 20:09:20 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.32 2008/04/21 04:41:37 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -82,10 +82,6 @@
static u_long ticks_per_sec = 12500000;
static long ticks_per_intr;
-#define DIFF19041970 2082844800
-
-static int clockinitted = 0;
-
static timecounter_get_t decr_get_timecount;
static struct timecounter decr_timecounter = {
@@ -97,70 +93,6 @@
};
void
-inittodr(time_t base)
-{
- time_t deltat;
- u_int rtc_time;
- struct timespec ts;
- phandle_t phandle;
- ihandle_t ihandle;
- char rtcpath[128];
- u_int rtcsecs;
-
- /*
- * If we can't read from RTC, use the fs time.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Mon Apr 21 18:24:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9CBF910656B0; Mon, 21 Apr 2008 18:24:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 5E1431065689
for <perforce@FreeBSD.org>; Mon, 21 Apr 2008 18:24:04 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 53C048FC3F
for <perforce@FreeBSD.org>; Mon, 21 Apr 2008 18:24:04 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3LIO3uc031819
for <perforce@FreeBSD.org>; Mon, 21 Apr 2008 18:24:03 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3LIO3Nf031817
for perforce@freebsd.org; Mon, 21 Apr 2008 18:24:03 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Mon, 21 Apr 2008 18:24:03 GMT
Message-Id: <200804211824.m3LIO3Nf031817@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140367 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Apr 2008 18:24:05 -0000
http://perforce.freebsd.org/chv.cgi?CH=140367
Change 140367 by hselasky@hselasky_laptop001 on 2008/04/21 18:23:48
Need to flush after last write to structure and not before.
Affected files ...
.. //depot/projects/usb/src/sys/dev/usb/ehci.c#76 edit
.. //depot/projects/usb/src/sys/dev/usb/ohci.c#63 edit
.. //depot/projects/usb/src/sys/dev/usb/uhci.c#62 edit
Differences ...
==== //depot/projects/usb/src/sys/dev/usb/ehci.c#76 (text+ko) ====
@@ -1113,11 +1113,11 @@
sqh->qh_qtd.qtd_next = htole32(EHCI_LINK_TERMINATE);
- usbd_pc_cpu_flush(sqh->page_cache);
-
last = ((last == sqh) ? sqh->prev : last);
sqh->prev = 0;
+
+ usbd_pc_cpu_flush(sqh->page_cache);
}
return (last);
}
==== //depot/projects/usb/src/sys/dev/usb/ohci.c#63 (text+ko) ====
@@ -755,11 +755,11 @@
sed->ed_flags |= htole32(OHCI_ED_SKIP);
sed->ed_headp = sed->ed_tailp;
- usbd_pc_cpu_flush(sed->page_cache);
-
last = ((last == sed) ? sed->prev : last);
sed->prev = 0;
+
+ usbd_pc_cpu_flush(sed->page_cache);
}
return (last);
}
==== //depot/projects/usb/src/sys/dev/usb/uhci.c#62 (text+ko) ====
@@ -1011,11 +1011,11 @@
*/
sqh->qh_e_next = htole32(UHCI_PTR_T);
- usbd_pc_cpu_flush(sqh->page_cache);
-
last = ((last == sqh) ? sqh->h_prev : last);
sqh->h_prev = 0;
+
+ usbd_pc_cpu_flush(sqh->page_cache);
}
return (last);
}
From owner-p4-projects@FreeBSD.ORG Mon Apr 21 18:39:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CC2421065672; Mon, 21 Apr 2008 18:39:19 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 8E00D106564A
for <perforce@FreeBSD.org>; Mon, 21 Apr 2008 18:39:19 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 82FD08FC1C
for <perforce@FreeBSD.org>; Mon, 21 Apr 2008 18:39:19 +0000 (UTC)
(envelope-from hselasky@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3LIdJMP032472
for <perforce@FreeBSD.org>; Mon, 21 Apr 2008 18:39:19 GMT
(envelope-from hselasky@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3LIdJR5032470
for perforce@freebsd.org; Mon, 21 Apr 2008 18:39:19 GMT
(envelope-from hselasky@FreeBSD.org)
Date: Mon, 21 Apr 2008 18:39:19 GMT
Message-Id: <200804211839.m3LIdJR5032470@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
hselasky@FreeBSD.org using -f
From: Hans Petter Selasky <hselasky@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140368 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 21 Apr 2008 18:39:20 -0000
http://perforce.freebsd.org/chv.cgi?CH=140368
Change 140368 by hselasky@hselasky_laptop001 on 2008/04/21 18:38:30
Get some needed ARM fixes from @ 140356 .
Affected files ...
.. //depot/projects/usb/src/sys/arm/arm/intr.c#7 integrate
.. //depot/projects/usb/src/sys/arm/at91/at91.c#9 integrate
.. //depot/projects/usb/src/sys/arm/include/intr.h#4 integrate
Differences ...
==== //depot/projects/usb/src/sys/arm/arm/intr.c#7 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.21 2008/04/11 03:26:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.22 2008/04/20 23:29:06 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
@@ -59,6 +59,8 @@
void arm_handler_execute(struct trapframe *, int);
+void (*arm_post_filter)(void *) = NULL;
+
void
arm_setup_irqhandler(const char *name, driver_filter_t *filt,
void (*hand)(void*), void *arg, int irq, int flags, void **cookiep)
@@ -72,7 +74,7 @@
if (event == NULL) {
error = intr_event_create(&event, (void *)irq, 0, irq,
(mask_fn)arm_mask_irq, (mask_fn)arm_unmask_irq,
- NULL, NULL, "intr%d:", irq);
+ arm_post_filter, NULL, "intr%d:", irq);
if (error)
return;
intr_events[irq] = event;
==== //depot/projects/usb/src/sys/arm/at91/at91.c#9 (text) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.15 2007/12/19 17:34:17 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.16 2008/04/20 23:29:06 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,8 @@
static struct at91_softc *at91_softc;
+static void at91_eoi(void *);
+
static int
at91_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
bus_space_handle_t *bshp)
@@ -172,6 +174,7 @@
at91_probe(device_t dev)
{
device_set_desc(dev, "AT91 device bus");
+ arm_post_filter = at91_eoi;
return (0);
}
@@ -689,6 +692,13 @@
}
+static void
+at91_eoi(void *unused)
+{
+ bus_space_write_4(at91_softc->sc_st, at91_softc->sc_sys_sh,
+ IC_EOICR, 0);
+}
+
static device_method_t at91_methods[] = {
DEVMETHOD(device_probe, at91_probe),
DEVMETHOD(device_attach, at91_attach),
==== //depot/projects/usb/src/sys/arm/include/intr.h#4 (text+ko) ====
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/intr.h,v 1.7 2007/06/16 15:03:33 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/intr.h,v 1.8 2008/04/20 23:29:06 cognet Exp $
*
*/
@@ -55,4 +55,5 @@
void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*),
void *, int, int, void **);
int arm_remove_irqhandler(void *);
+extern void (*arm_post_filter)(void *);
#endif /* _MACHINE_INTR_H */
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 02:12:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3E1ED1065670; Tue, 22 Apr 2008 02:12:04 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id DB9871065676
for <perforce@freebsd.org>; Tue, 22 Apr 2008 02:12:03 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id D56318FC17
for <perforce@freebsd.org>; Tue, 22 Apr 2008 02:12:03 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3M2C3aU077092
for <perforce@freebsd.org>; Tue, 22 Apr 2008 02:12:03 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M2C31R077090
for perforce@freebsd.org; Tue, 22 Apr 2008 02:12:03 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 02:12:03 GMT
Message-Id: <200804220212.m3M2C31R077090@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140380 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 02:12:04 -0000
http://perforce.freebsd.org/chv.cgi?CH=140380
Change 140380 by jb@freebsd3 on 2008/04/22 02:11:32
IF7
Affected files ...
.. //depot/projects/dtrace7/src/ObsoleteFiles.inc#8 integrate
.. //depot/projects/dtrace7/src/bin/sh/cd.c#2 integrate
.. //depot/projects/dtrace7/src/bin/sh/options.c#2 integrate
.. //depot/projects/dtrace7/src/compat/opensolaris/include/devid.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/fsshare.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/libintl.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/mnttab.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/priv.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/solaris.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/include/zone.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/lib/libumem/umem.h#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/deviceid.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/fsshare.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/mkdirp.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/mnttab.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/zmount.c#3 delete
.. //depot/projects/dtrace7/src/compat/opensolaris/misc/zone.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/OPENSOLARIS.LICENSE#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb.8#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zdb/zdb_il.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs.8#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_iter.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_iter.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_main.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zfs/zfs_util.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool.8#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_iter.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_main.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_util.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_util.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/zpool/zpool_vdev.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/cmd/ztest/ztest.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/assert.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/atomic.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/libintl.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/stdio_ext.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/synch.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/head/thread.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libnvpair/libnvpair.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libnvpair/libnvpair.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_avl.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_ident.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_list.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_misc.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_open.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_pname.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#3 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/kernel.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#6 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/taskq.c#4 delete
.. //depot/projects/dtrace7/src/contrib/opensolaris/lib/libzpool/common/util.c#4 delete
.. //depot/projects/dtrace7/src/lib/libc/sys/fcntl.2#3 integrate
.. //depot/projects/dtrace7/src/lib/libutil/humanize_number.c#2 integrate
.. //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/errata/article.sgml#3 integrate
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_atomic.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kmem.c#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kobj.c#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_kstat.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_misc.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_policy.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_string.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#5 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/kern/opensolaris_zone.c#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/rpc/xdr.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/acl.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/atomic.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/byteorder.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/callb.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cmn_err.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/cred.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/debug.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dirent.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dkio.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/dnlc.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kcondvar.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kmem.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kobj.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/kstat.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/lock.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/misc.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mntent.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mnttab.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mount.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/mutex.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/policy.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/proc.h#5 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/random.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/rwlock.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/string.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sunddi.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/sysmacros.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/systm.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/taskq.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/taskq_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/time.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/types.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/uio.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/varargs.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vfs.h#3 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/vnode.h#4 delete
.. //depot/projects/dtrace7/src/sys/compat/opensolaris/sys/zone.h#3 delete
.. //depot/projects/dtrace7/src/sys/conf/files#8 integrate
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/OPENSOLARIS.LICENSE#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/acl/acl_common.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/acl/acl_common.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/atomic/amd64/atomic.S#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/atomic/i386/atomic.S#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/atomic/ia64/atomic.S#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/avl/avl.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/zfs/zfs_namecheck.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/zfs/zfs_prop.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/common/zfs/zfs_prop.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/Makefile.files#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/gfs.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/bplist.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/gzip.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/refcount.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sha256.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/space_map.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/txg.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/unique.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#6 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#5 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/os/callb.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/os/list.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/os/taskq.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/rpc/xdr_array.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/rpc/xdr_mem.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/avl.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/avl_impl.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/bitmap.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/callb.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/ccompile.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/compress.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/cred.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/debug.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dkio.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/dklabel.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/errorq.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/feature_tests.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fm/protocol.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fm/util.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/fs/zfs.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/gfs.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/list.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/list_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/note.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/nvpair.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/nvpair_impl.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/processor.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/procset.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/synch.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/sysevent.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/sys/zmod.h#4 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/adler32.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/crc32.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/crc32.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/deflate.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/deflate.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inffast.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inffast.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inffixed.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inflate.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inflate.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/inftrees.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/trees.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zconf.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zlib.h#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zmod.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zmod_subr.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zutil.c#3 delete
.. //depot/projects/dtrace7/src/sys/contrib/opensolaris/uts/common/zmod/zutil.h#3 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_ctl_defs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_mc5.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_tcb.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_version.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_adapter.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_config.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_include.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_ioctl.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_l2t.c#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_l2t.h#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_lro.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_multiq.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_offload.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_osdep.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_sge.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_t3fw.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/cxgb_t3fw.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/cxgb_support.c#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/mvec.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/sys/uipc_mvec.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3b_protocol_sram-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3b_protocol_sram.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3b_tp_eeprom-1.1.0.bin.gz.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3b_tp_eeprom.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3cdev.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/t3fw-4.7.0.bin.gz.uu#2 delete
.. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch
.. //depot/projects/dtrace7/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete
.. //depot/projects/dtrace7/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_descrip.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_sig.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/dtrace7/src/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/dtrace7/src/sys/modules/cxgb/Makefile#2 integrate
.. //depot/projects/dtrace7/src/sys/modules/cxgb/cxgb/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/modules/cxgb/cxgb_t3fw/Makefile#1 branch
.. //depot/projects/dtrace7/src/sys/net/if_tap.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netgraph/ng_base.c#5 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw_pfil.c#2 integrate
.. //depot/projects/dtrace7/src/sys/nlm/nlm_prot_impl.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_arg.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm.c#4 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_bsm_token.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_syscalls.c#4 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_trigger.c#3 integrate
.. //depot/projects/dtrace7/src/sys/security/audit/audit_worker.c#4 integrate
.. //depot/projects/dtrace7/src/sys/security/mac/mac_framework.h#2 integrate
.. //depot/projects/dtrace7/src/sys/security/mac/mac_internal.h#2 integrate
.. //depot/projects/dtrace7/src/sys/security/mac/mac_policy.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/fcntl.h#3 integrate
.. //depot/projects/dtrace7/src/sys/sys/param.h#7 integrate
.. //depot/projects/dtrace7/src/tools/regression/file/dup/dup.c#2 integrate
Differences ...
==== //depot/projects/dtrace7/src/ObsoleteFiles.inc#8 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.12 2008/04/08 09:07:43 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.112.2.13 2008/04/20 16:44:50 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -30,6 +30,11 @@
OLD_FILES+=usr/lib/libkse.a
OLD_FILES+=usr/lib/libkse_p.a
OLD_FILES+=usr/lib/libkse_pic.a
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libkse.a
+OLD_FILES+=usr/lib32/libkse_p.a
+OLD_FILES+=usr/lib32/libkse_pic.a
+.endif
.endif
# 20070930: rename of cached to nscd
OLD_FILES+=etc/cached.conf
@@ -116,6 +121,12 @@
OLD_DIRS+=usr/include/netatm/uni
OLD_DIRS+=usr/include/netatm
OLD_DIRS+=usr/share/examples/atm
+.if ${TARGET_ARCH} == "amd64"
+OLD_FILES+=usr/lib32/libatm.a
+OLD_FILES+=usr/lib32/libatm.so
+OLD_LIBS+=usr/lib32/libatm.so.5
+OLD_FILES+=usr/lib32/libatm_p.a
+.endif
# 20070705: I4B headers repo-copied to include/i4b/
.if ${TARGET_ARCH} == "i386"
OLD_FILES+=usr/include/machine/i4b_cause.h
@@ -206,6 +217,42 @@
OLD_LIBS+=usr/lib/snmp_mibII.so.4
OLD_LIBS+=usr/lib/snmp_netgraph.so.4
OLD_LIBS+=usr/lib/snmp_pf.so.4
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libalias.so.5
+OLD_LIBS+=usr/lib32/libbsnmp.so.3
+OLD_LIBS+=usr/lib32/libdialog.so.5
+OLD_LIBS+=usr/lib32/libgnuregex.so.3
+OLD_LIBS+=usr/lib32/libhistory.so.6
+OLD_LIBS+=usr/lib32/libncurses.so.6
+OLD_LIBS+=usr/lib32/libncursesw.so.6
+OLD_LIBS+=usr/lib32/libpam.so.3
+OLD_LIBS+=usr/lib32/libreadline.so.6
+OLD_LIBS+=usr/lib32/libssh.so.3
+OLD_LIBS+=usr/lib32/pam_chroot.so.3
+OLD_LIBS+=usr/lib32/pam_deny.so.3
+OLD_LIBS+=usr/lib32/pam_echo.so.3
+OLD_LIBS+=usr/lib32/pam_exec.so.3
+OLD_LIBS+=usr/lib32/pam_ftpusers.so.3
+OLD_LIBS+=usr/lib32/pam_group.so.3
+OLD_LIBS+=usr/lib32/pam_guest.so.3
+OLD_LIBS+=usr/lib32/pam_krb5.so.3
+OLD_LIBS+=usr/lib32/pam_ksu.so.3
+OLD_LIBS+=usr/lib32/pam_lastlog.so.3
+OLD_LIBS+=usr/lib32/pam_login_access.so.3
+OLD_LIBS+=usr/lib32/pam_nologin.so.3
+OLD_LIBS+=usr/lib32/pam_opie.so.3
+OLD_LIBS+=usr/lib32/pam_opieaccess.so.3
+OLD_LIBS+=usr/lib32/pam_passwdqc.so.3
+OLD_LIBS+=usr/lib32/pam_permit.so.3
+OLD_LIBS+=usr/lib32/pam_radius.so.3
+OLD_LIBS+=usr/lib32/pam_rhosts.so.3
+OLD_LIBS+=usr/lib32/pam_rootok.so.3
+OLD_LIBS+=usr/lib32/pam_securetty.so.3
+OLD_LIBS+=usr/lib32/pam_self.so.3
+OLD_LIBS+=usr/lib32/pam_ssh.so.3
+OLD_LIBS+=usr/lib32/pam_tacplus.so.3
+OLD_LIBS+=usr/lib32/pam_unix.so.3
+.endif
# 20070613: IPX over IP tunnel removal
OLD_FILES+=usr/include/netipx/ipx_ip.h
# 20070605: sched_core removal
@@ -585,6 +632,9 @@
OLD_FILES+=usr/share/info/bzip2.info.gz
# 20070303: libarchive 2.0
OLD_LIBS+=usr/lib/libarchive.so.3
+.if ${TARGET_ARCH} == "amd64"
+OLD_LIBS+=usr/lib32/libarchive.so.3
+.endif
# 20070301: remove addr2ascii and ascii2addr
OLD_FILES+=usr/share/man/man3/addr2ascii.3.gz
OLD_FILES+=usr/share/man/man3/ascii2addr.3.gz
==== //depot/projects/dtrace7/src/bin/sh/cd.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35 2006/06/12 21:06:00 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.35.2.1 2008/04/20 17:55:31 stefanf Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -68,7 +68,9 @@
STATIC int cdphysical(char *);
STATIC int docd(char *, int, int);
STATIC char *getcomponent(void);
-STATIC int updatepwd(char *);
+STATIC char *findcwd(char *);
+STATIC void updatepwd(char *);
+STATIC char *getpwd2(char *, size_t);
STATIC char *curdir = NULL; /* current working directory */
STATIC char *prevdir; /* previous working directory */
@@ -201,10 +203,11 @@
}
INTOFF;
- if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) {
+ if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) {
INTON;
return (-1);
}
+ updatepwd(p);
INTON;
return (0);
}
@@ -212,12 +215,14 @@
STATIC int
cdphysical(char *dest)
{
+ char *p;
INTOFF;
- if (chdir(dest) < 0 || updatepwd(NULL) < 0) {
+ if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) {
INTON;
return (-1);
}
+ updatepwd(p);
INTON;
return (0);
}
@@ -247,38 +252,20 @@
}
-/*
- * Update curdir (the name of the current directory) in response to a
- * cd command. We also call hashcd to let the routines in exec.c know
- * that the current directory has changed.
- */
-STATIC int
-updatepwd(char *dir)
+STATIC char *
+findcwd(char *dir)
{
char *new;
char *p;
- hashcd(); /* update command hash table */
-
/*
* If our argument is NULL, we don't know the current directory
* any more because we traversed a symbolic link or something
* we couldn't stat().
*/
if (dir == NULL || curdir == NULL) {
- if (prevdir)
- ckfree(prevdir);
- INTOFF;
- prevdir = curdir;
- curdir = NULL;
- if (getpwd() == NULL) {
- INTON;
- return (-1);
- }
- setvar("PWD", curdir, VEXPORT);
- setvar("OLDPWD", prevdir, VEXPORT);
- INTON;
- return (0);
+ p = stalloc(PATH_MAX);
+ return getpwd2(p, PATH_MAX);
}
cdcomppath = stalloc(strlen(dir) + 1);
scopy(dir, cdcomppath);
@@ -302,16 +289,25 @@
if (new == stackblock())
STPUTC('/', new);
STACKSTRNUL(new);
- INTOFF;
+ return stackblock();
+}
+
+/*
+ * Update curdir (the name of the current directory) in response to a
+ * cd command. We also call hashcd to let the routines in exec.c know
+ * that the current directory has changed.
+ */
+STATIC void
+updatepwd(char *dir)
+{
+ hashcd(); /* update command hash table */
+
if (prevdir)
ckfree(prevdir);
prevdir = curdir;
- curdir = savestr(stackblock());
+ curdir = savestr(dir);
setvar("PWD", curdir, VEXPORT);
setvar("OLDPWD", prevdir, VEXPORT);
- INTON;
-
- return (0);
}
int
@@ -355,17 +351,31 @@
}
/*
- * Find out what the current directory is. If we already know the current
- * directory, this routine returns immediately.
+ * Get the current directory and cache the result in curdir.
*/
char *
getpwd(void)
{
char buf[PATH_MAX];
+ char *p;
if (curdir)
return curdir;
- if (getcwd(buf, sizeof(buf)) == NULL) {
+
+ p = getpwd2(buf, sizeof(buf));
+ if (p != NULL)
+ curdir = savestr(p);
+
+ return curdir;
+}
+
+/*
+ * Return the current directory.
+ */
+STATIC char *
+getpwd2(char *buf, size_t size)
+{
+ if (getcwd(buf, size) == NULL) {
char *pwd = getenv("PWD");
struct stat stdot, stpwd;
@@ -373,12 +383,9 @@
stat(pwd, &stpwd) != -1 &&
stdot.st_dev == stpwd.st_dev &&
stdot.st_ino == stpwd.st_ino) {
- curdir = savestr(pwd);
- return curdir;
+ return pwd;
}
return NULL;
}
- curdir = savestr(buf);
-
- return curdir;
+ return buf;
}
==== //depot/projects/dtrace7/src/bin/sh/options.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25 2006/04/09 12:20:42 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.25.2.1 2008/04/20 18:02:41 stefanf Exp $");
#include <signal.h>
#include <unistd.h>
@@ -383,7 +383,7 @@
}
ap2 = shellparam.p;
while ((*ap2++ = *ap1++) != NULL);
- shellparam.optnext = NULL;
+ shellparam.reset = 1;
INTON;
return 0;
}
@@ -405,6 +405,7 @@
if (*argptr != NULL) {
setparam(argptr);
}
+ shellparam.reset = 1;
INTON;
return 0;
}
@@ -414,7 +415,6 @@
getoptsreset(const char *value)
{
if (number(value) == 1) {
- shellparam.optnext = NULL;
shellparam.reset = 1;
}
}
==== //depot/projects/dtrace7/src/lib/libc/sys/fcntl.2#3 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fcntl.2 8.2 (Berkeley) 1/12/94
-.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.45.2.1 2008/04/10 09:39:20 dfr Exp $
+.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.45.2.2 2008/04/20 19:32:45 antoine Exp $
.\"
-.Dd January 12, 1994
+.Dd March 8, 2008
.Dt FCNTL 2
.Os
.Sh NAME
@@ -78,6 +78,18 @@
.Xr execve 2
system calls.
.El
+.It Dv F_DUP2FD
+It is functionally equivalent to
+.Bd -literal -offset indent
+dup2(fd, arg)
+.Ed
+.Pp
+The
+.Dv F_DUP2FD
+constant is not portable, so it should not be used if portability is needed.
+Use
+.Fn dup2
+instead.
.It Dv F_GETFD
Get the close-on-exec flag associated with the file descriptor
.Fa fd
@@ -394,6 +406,9 @@
.Bl -tag -width F_GETOWNX -offset indent
.It Dv F_DUPFD
A new file descriptor.
+.It Dv F_DUP2FD
+A file descriptor equal to
+.Fa arg .
.It Dv F_GETFD
Value of flag (only the low-order bit is defined).
.It Dv F_GETFL
@@ -437,6 +452,14 @@
The argument
.Fa cmd
is
+.Dv F_DUP2FD ,
+and
+.Fa arg
+is not a valid file descriptor.
+.Pp
+The argument
+.Fa cmd
+is
.Dv F_SETLK
or
.Dv F_SETLKW ,
@@ -500,6 +523,8 @@
.Fa cmd
is
.Dv F_DUPFD
+or
+.Dv F_DUP2FD
and the maximum number of file descriptors permitted for the
process are already in use,
or no file descriptors greater than or equal to
@@ -572,6 +597,7 @@
.Xr tcgetpgrp 3 .
.Sh SEE ALSO
.Xr close 2 ,
+.Xr dup2 2 ,
.Xr execve 2 ,
.Xr flock 2 ,
.Xr getdtablesize 2 ,
@@ -580,8 +606,18 @@
.Xr lockf 3 ,
.Xr tcgetpgrp 3 ,
.Xr tcsetpgrp 3
+.Sh STANDARDS
+The
+.Dv F_DUP2FD
+constant is non portable.
+It is provided for compatibility with AIX and Solaris.
.Sh HISTORY
The
.Fn fcntl
system call appeared in
.Bx 4.2 .
+.Pp
+The
+.Dv F_DUP2FD
+constant first appeared in
+.Fx 7.1 .
==== //depot/projects/dtrace7/src/lib/libutil/humanize_number.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: humanize_number.c,v 1.8 2004/07/27 01:56:24 enami Exp $ */
+/* $NetBSD: humanize_number.c,v 1.13 2007/12/14 17:26:19 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -38,10 +38,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/humanize_number.c,v 1.2 2004/09/25 14:11:34 pjd Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/humanize_number.c,v 1.2.10.1 2008/04/20 16:29:01 antoine Exp $");
#include <sys/types.h>
#include <assert.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -118,7 +119,12 @@
for (max = 100, i = len - baselen; i-- > 0;)
max *= 10;
- for (i = 0; bytes >= max && i < maxscale; i++)
+ /*
+ * Divide the number until it fits the given column.
+ * If there will be an overflow by the rounding below,
+ * divide once more.
+ */
+ for (i = 0; bytes >= max - 50 && i < maxscale; i++)
bytes /= divisor;
if (scale & HN_GETSCALE)
@@ -139,9 +145,8 @@
sign * s1, localeconv()->decimal_point, s2,
sep, SCALE2PREFIX(i), suffix);
} else
- r = snprintf(buf, len, "%lld%s%s%s",
- /* LONGLONG */
- (long long)(sign * ((bytes + 50) / 100)),
+ r = snprintf(buf, len, "%" PRId64 "%s%s%s",
+ sign * ((bytes + 50) / 100),
sep, SCALE2PREFIX(i), suffix);
return (r);
==== //depot/projects/dtrace7/src/release/doc/en_US.ISO8859-1/errata/article.sgml#3 (text+ko) ====
@@ -37,7 +37,7 @@
The &os; Project
</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.3 2008/03/07 16:32:42 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.4.4 2008/04/17 19:03:43 delphij Exp $</pubdate>
<copyright>
<year>2008</year>
@@ -130,7 +130,33 @@
]]>
<![ %release.type.snapshot [
- <para>No advisories.</para>
+ <para>The following security advisories pertain to &os; &release.bugfix;.
+ For more information, consult the individual advisories available from
+ <ulink url="http://security.FreeBSD.org/"></ulink>.</para>
+
+ <informaltable frame="none" pgwide="0">
+ <tgroup cols="3">
+ <colspec colwidth="1*">
+ <colspec colwidth="1*">
+ <colspec colwidth="3*">
+ <thead>
+ <row>
+ <entry>Advisory</entry>
+ <entry>Date</entry>
+ <entry>Topic</entry>
+ </row>
+ </thead>
+
+ <tbody>
+ <row>
+ <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-08:05.openssh.asc"
+ >SA-08:05.openssh</ulink></entry>
+ <entry>17 April 2008</entry>
+ <entry><para>OpenSSH X11-forwarding privilege escalation</para></entry>
+ </row>
+ </tbody>
+ </tgroup>
+ </informaltable>
]]>
</sect1>
==== //depot/projects/dtrace7/src/sys/conf/files#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1243.2.16 2008/04/14 06:21:34 yongari Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1243.2.17 2008/04/18 02:45:35 kmacy Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -515,9 +515,9 @@
dev/cs/if_cs_pccard.c optional cs pccard
dev/cxgb/cxgb_main.c optional cxgb pci
dev/cxgb/cxgb_offload.c optional cxgb pci
-dev/cxgb/cxgb_l2t.c optional cxgb pci
dev/cxgb/cxgb_lro.c optional cxgb pci
dev/cxgb/cxgb_sge.c optional cxgb pci
+dev/cxgb/cxgb_multiq.c optional cxgb pci
dev/cxgb/common/cxgb_mc5.c optional cxgb pci
dev/cxgb/common/cxgb_vsc7323.c optional cxgb pci
dev/cxgb/common/cxgb_vsc8211.c optional cxgb pci
@@ -526,6 +526,8 @@
dev/cxgb/common/cxgb_xgmac.c optional cxgb pci
dev/cxgb/common/cxgb_t3_hw.c optional cxgb pci
dev/cxgb/sys/uipc_mvec.c optional cxgb pci
+dev/cxgb/sys/cxgb_support.c optional cxgb pci
+dev/cxgb/cxgb_t3fw.c optional cxgb cxgb_t3fw
dev/cy/cy.c optional cy
dev/cy/cy_isa.c optional cy isa
dev/cy/cy_pci.c optional cy pci
==== //depot/projects/dtrace7/src/sys/dev/cxgb/common/cxgb_ael1002.c#2 (text+ko) ====
@@ -1,6 +1,6 @@
/**************************************************************************
-Copyright (c) 2007, Chelsio Inc.
+Copyright (c) 2007-2008, Chelsio Inc.
All rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -28,7 +28,7 @@
***************************************************************************/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.3 2007/06/13 05:36:00 kmacy Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/cxgb/common/cxgb_ael1002.c,v 1.3.2.1 2008/04/18 02:45:36 kmacy Exp $");
#ifdef CONFIG_DEFINED
#include <cxgb_include.h>
@@ -36,6 +36,9 @@
#include <dev/cxgb/cxgb_include.h>
#endif
+#undef msleep
+#define msleep t3_os_sleep
+
enum {
AEL100X_TX_DISABLE = 9,
AEL100X_TX_CONFIG1 = 0xc002,
@@ -52,9 +55,9 @@
{
int tx_on_gpio = phy->addr == 0 ? F_GPIO7_OUT_VAL : F_GPIO2_OUT_VAL;
- t3_os_sleep(100);
+ msleep(100);
t3_set_reg_field(phy->adapter, A_T3DBG_GPIO_EN, 0, tx_on_gpio);
- t3_os_sleep(30);
+ msleep(30);
}
static int ael1002_power_down(struct cphy *phy, int enable)
@@ -115,7 +118,6 @@
#ifdef C99_NOT_SUPPORTED
static struct cphy_ops ael1002_ops = {
- NULL,
ael1002_reset,
ael1002_intr_noop,
ael1002_intr_noop,
@@ -141,11 +143,14 @@
};
#endif
-void t3_ael1002_phy_prep(struct cphy *phy, adapter_t *adapter, int phy_addr,
- const struct mdio_ops *mdio_ops)
+int t3_ael1002_phy_prep(struct cphy *phy, adapter_t *adapter, int phy_addr,
+ const struct mdio_ops *mdio_ops)
{
- cphy_init(phy, adapter, phy_addr, &ael1002_ops, mdio_ops);
+ cphy_init(phy, adapter, phy_addr, &ael1002_ops, mdio_ops,
+ SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_FIBRE,
+ "10GBASE-R");
ael100x_txon(phy);
+ return 0;
}
static int ael1006_reset(struct cphy *phy, int wait)
@@ -188,7 +193,6 @@
#ifdef C99_NOT_SUPPORTED
static struct cphy_ops ael1006_ops = {
- NULL,
ael1006_reset,
ael1006_intr_enable,
ael1006_intr_disable,
@@ -214,16 +218,18 @@
};
#endif
-void t3_ael1006_phy_prep(struct cphy *phy, adapter_t *adapter, int phy_addr,
- const struct mdio_ops *mdio_ops)
+int t3_ael1006_phy_prep(struct cphy *phy, adapter_t *adapter, int phy_addr,
+ const struct mdio_ops *mdio_ops)
{
- cphy_init(phy, adapter, phy_addr, &ael1006_ops, mdio_ops);
+ cphy_init(phy, adapter, phy_addr, &ael1006_ops, mdio_ops,
+ SUPPORTED_10000baseT_Full | SUPPORTED_AUI | SUPPORTED_FIBRE,
+ "10GBASE-SR");
ael100x_txon(phy);
+ return 0;
}
#ifdef C99_NOT_SUPPORTED
static struct cphy_ops qt2045_ops = {
- NULL,
ael1006_reset,
ael1006_intr_enable,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 04:19:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id EC8941065671; Tue, 22 Apr 2008 04:19:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id AA5B9106566C
for <perforce@freebsd.org>; Tue, 22 Apr 2008 04:19:20 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 9E7A18FC19
for <perforce@freebsd.org>; Tue, 22 Apr 2008 04:19:20 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3M4JK8m083339
for <perforce@freebsd.org>; Tue, 22 Apr 2008 04:19:20 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M4JKSf083337
for perforce@freebsd.org; Tue, 22 Apr 2008 04:19:20 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 04:19:20 GMT
Message-Id: <200804220419.m3M4JKSf083337@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140382 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 04:19:21 -0000
http://perforce.freebsd.org/chv.cgi?CH=140382
Change 140382 by jb@freebsd3 on 2008/04/22 04:18:59
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#69 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#12 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#10 integrate
.. //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#27 integrate
.. //depot/projects/dtrace/src/contrib/gcc/gthr-posix.h#5 integrate
.. //depot/projects/dtrace/src/contrib/netcat/FREEBSD-upgrade#4 integrate
.. //depot/projects/dtrace/src/contrib/netcat/FREEBSD-vendor#1 branch
.. //depot/projects/dtrace/src/contrib/netcat/atomicio.c#4 integrate
.. //depot/projects/dtrace/src/contrib/netcat/atomicio.h#3 integrate
.. //depot/projects/dtrace/src/contrib/netcat/nc.1#6 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#32 integrate
.. //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 integrate
.. //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#18 integrate
.. //depot/projects/dtrace/src/share/man/man4/textdump.4#3 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/AVILA#10 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/BWCT#4 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/CRB#4 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/EP80219#7 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/HL200#5 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/IQ31244#9 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/KB920X#12 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/SIMICS#9 integrate
.. //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#9 integrate
.. //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#12 integrate
.. //depot/projects/dtrace/src/sys/conf/files#85 integrate
.. //depot/projects/dtrace/src/sys/conf/files.amd64#29 integrate
.. //depot/projects/dtrace/src/sys/conf/files.i386#34 integrate
.. //depot/projects/dtrace/src/sys/conf/files.pc98#20 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#28 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#16 integrate
.. //depot/projects/dtrace/src/sys/dev/ata/ata-queue.c#10 integrate
.. //depot/projects/dtrace/src/sys/dev/k8temp/k8temp.c#3 integrate
.. //depot/projects/dtrace/src/sys/ia64/conf/DEFAULTS#14 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_linker.c#33 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/ADM5120#2 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/IDT#3 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/dtrace/src/sys/mips/conf/SENTRY5#3 integrate
.. //depot/projects/dtrace/src/sys/netinet/ip_divert.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet/raw_ip.c#15 integrate
.. //depot/projects/dtrace/src/sys/netinet6/icmp6.c#13 integrate
.. //depot/projects/dtrace/src/sys/netinet6/raw_ip6.c#11 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#4 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/nexus.c#3 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/DEFAULTS#10 integrate
.. //depot/projects/dtrace/src/sys/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/dtrace/src/sys/sparc64/conf/GENERIC#21 integrate
.. //depot/projects/dtrace/src/sys/sparc64/conf/NOTES#9 integrate
.. //depot/projects/dtrace/src/sys/sun4v/conf/DEFAULTS#10 integrate
.. //depot/projects/dtrace/src/sys/sun4v/conf/NOTES#9 integrate
.. //depot/projects/dtrace/src/tools/tools/nanobsd/Files/root/save_cfg#1 branch
.. //depot/projects/dtrace/src/usr.bin/procstat/procstat.1#3 integrate
.. //depot/projects/dtrace/src/usr.sbin/ancontrol/ancontrol.c#4 integrate
.. //depot/projects/dtrace/www/en/Makefile#9 integrate
.. //depot/projects/dtrace/www/en/community.xsl#2 integrate
.. //depot/projects/dtrace/www/share/sgml/libcommon.xsl#11 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#69 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.924 2008/04/20 19:46:14 antoine Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.926 2008/04/21 16:48:24 jkim Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11826,6 +11826,12 @@
</row>
<row>
+ <entry>7.0-STABLE after the MFC of &man.write.2; support
+ to &man.psm.4;.</entry>
+ <entry>700106</entry>
+ </row>
+
+ <row>
<entry>7.0-STABLE after the MFC of F_DUP2FD command
to &man.fcntl.2;.</entry>
<entry>700107</entry>
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml#12 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Chinese Documentation Project
- Original Revision: 1.180
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.16 2008/02/09 13:33:15 loader Exp $
+ Original Revision: 1.181
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/kernelconfig/chapter.sgml,v 1.17 2008/04/21 06:46:26 loader Exp $
-->
<chapter id="kernelconfig">
@@ -1219,7 +1219,7 @@
<sect1 id="kernelconfig-trouble">
<title>Èç¹û³öÏÖÎÊÌâÔõô°ì</title>
- <para>ÔÚ¶¨ÖÆÒ»¸öÄÚºËʱ£¬¿ÉÄÜ»á³öÏÖÎåÖÖÎÊÌâ¡£ËüÃÇÊÇ£º</para>
+ <para>ÔÚ¶¨ÖÆÒ»¸öÄÚºËʱ£¬¿ÉÄÜ»á³öÏÖËÄÖÖÎÊÌâ¡£ËüÃÇÊÇ£º</para>
<variablelist>
<varlistentry>
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml#12 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.103
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml,v 1.18 2008/04/02 16:28:58 loader Exp $
+ Original Revision: 1.104
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/network-servers/chapter.sgml,v 1.19 2008/04/21 06:46:26 loader Exp $
-->
<chapter id="network-servers">
@@ -3679,7 +3679,7 @@
ÈÃÓ¦ÓóÌÐòµÄÂß¼²¿·ÖÓë HTML µÄ±íÏÖ²ã·ÖÀë¡£</para>
<para>Django ÒÀÀµÓë <application>mod_python</application>£¬
- <application>Apache</application>, and Ò»¸ö¿ÉÑ¡µÄ SQL
+ <application>Apache</application>, ºÍÒ»¸ö¿ÉÑ¡µÄ SQL
Êý¾Ý¿âÒýÇæ¡£ ÔÚÉèÖÃÁËһЩǡµ±µÄ±êÖ¾ºó£¬FreeBSD µÄ Port
ϵͳ½«»á°ïÖúÄã°²×°ÕâЩ±ØÐèµÄÒÀÀµ¿â¡£</para>
@@ -4012,8 +4012,8 @@
<title>ÅäÖÃ</title>
<para>ĬÈ쵀 <application>Samba</application> ÅäÖÃÎļþ»áÒÔ
- <filename>/usr/local/share/examples/smb.conf.default</filename> µÄÃû×Ö°²×°¡£
- Õâ¸öÎļþ±ØÐ븴ÖÆΪ
+ <filename>/usr/local/share/examples/samba/smb.conf.default</filename>
+ µÄÃû×Ö°²×°¡£Õâ¸öÎļþ±ØÐ븴ÖÆΪ
<filename>/usr/local/etc/smb.conf</filename> ²¢½øÐж¨ÖÆ£¬
²ÅÄÜ¿ªÊ¼Ê¹Óà <application>Samba</application>¡£</para>
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml#10 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.111
- $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.10 2008/04/02 16:28:58 loader Exp $
+ Original Revision: 1.112
+ $FreeBSD: doc/zh_CN.GB2312/books/handbook/printing/chapter.sgml,v 1.11 2008/04/21 06:46:27 loader Exp $
-->
<chapter id="printing">
@@ -2238,10 +2238,10 @@
<secondary>filters</secondary>
<tertiary>apsfilter</tertiary>
</indexterm>
- <para>FreeBSD Ports Collection °üº¬ÁËÒ»¸ö¿ÉÒÔ×Ô¶¯½øÐÐת»»µÄÎı¾¹ýÂËÆ÷£¬
- Ãû×Ö½Ð×ö <command>apsfilter</command>¡£
- Ëü¿ÉÒÔ¼ì²â³ö´¿Îı¾£¬ &postscript;£¬ ºÍ DVI ¸ñʽµÄÎļþ£¬
- ²¢ÇÒÔËÐÐÏàÓ¦µÄת»»¹ýÂËÆ÷£¬ È»ºó´òÓ¡¡£</para>
+ <para>FreeBSD µÄ Ports Ì×¼þÌṩÁËÒ»¸ö¿ÉÒÔ×Ô¶¯½øÐÐת»»µÄÎı¾¹ýÂËÆ÷£¬
+ Ãû×Ö½Ð×ö <command>apsfilter</command> (<filename role="package">print/apsfilter</filename>)¡£
+ Ëü¿ÉÒÔ¼ì²â´¿Îı¾¡¢ &postscript;¡¢ DVI ÒÔ¼°¼¸ºõÈκθñʽµÄÎļþ£¬
+ ²¢ÔÚÖ´ÐÐÏàÓ¦µÄת»»Ö®ºóÍê³É´òÓ¡¹¤×÷¡£</para>
</sect4>
</sect3>
@@ -2447,8 +2447,8 @@
<para>ͨ¹ýÆôÓñ¨Í·Ò³£¬ <application>LPD</application>
½«Éú³É³öÒ»¸ö <emphasis>³¤±¨Í·</emphasis>£¬
Ò»ÕûÒ³µÄ´ó×Öĸ£¬ ±ê×ÅÓû§£¬ Ö÷»úºÍÈÎÎñÃû¡£
- ÏÂÃæÊÇÒ»¸öÀý×Ó (kelly ´òÓ¡ÁËÓÃÖ÷»ú
- <hostid>rose</hostid> ´òÓ¡ÁËÒ»¸ö½Ð×ö outline µÄÈÎÎñ)£º</para>
+ ÏÂÃæÊÇÒ»¸öÀý×Ó (<username>kelly</username> ´ÓÖ÷»ú
+ <hostid>rose</hostid> ´òÓ¡ÁËÒ»¸ö½Ð×ö <quote>outline</quote> µÄÈÎÎñ)£º</para>
<programlisting> k ll ll
k l l
@@ -2928,16 +2928,16 @@
<para>ÏÖÔÚ£¬ Ö÷»ú <hostid>orchid</hostid> ÉϵÄÓû§¿ÉÒÔ´òÓ¡µ½
<literal>rattan</literal> ºÍ <literal>bamboo</literal> ÁË¡£ Èç¹û£¬
- ±ÈÈ磬 Ò»¸öÓû§ÔÚÖ÷»ú <hostid>orchid</hostid> ÉÏÊäÈëÁË
+ ±ÈÈ磬 Ò»¸öÓû§ÔÚÖ÷»ú <hostid>orchid</hostid> ÉÏÊäÈëÁË£º</para>
<screen>&prompt.user; <userinput>lpr -P bamboo -d sushi-review.dvi</userinput></screen>
- <application>LPD</application> ϵͳÔÚÖ÷»ú <hostid>orchid</hostid>
+ <para><application>LPD</application> ϵͳÔÚÖ÷»ú <hostid>orchid</hostid>
ÉϻḴÖÆÕâ¸öÈÎÎñµ½ºǫ́´òÓ¡¶ÓÁÐĿ¼
<filename>/var/spool/lpd/bamboo</filename> ²¢ÇÒ¼ÇÏÂÕâÊÇÒ»¸ö
DVI ÈÎÎñ¡£ µ±Ö÷»ú <hostid>rose</hostid> ÉϵĴòÓ¡»ú
<literal>bamboo</literal> µÄºǫ́´òÓ¡¶ÓÁÐĿ¼ÓпռäµÄʱ£¬ ÕâÁ½¸ö
- <application>LPDs</application> ϵͳ½«»á´«ÊäÕâ¸öÎļþµ½Ö÷»ú
+ <application>LPD</application> ϵͳ½«»á´«ÊäÕâ¸öÎļþµ½Ö÷»ú
<hostid>rose</hostid> ÉÏ¡£ Îļþ½«ÅÅÔÚÖ÷»ú <hostid>rose</hostid>
µÄ¶ÓÁÐÖÐÖªµÀ×îÖÕ±»´òÓ¡³öÀ´¡£ Ëü½«±»´Ó DVI ת»»³É
&postscript; (ÒòΪ <literal>bamboo</literal> ÊÇһ̨ &postscript; ´òÓ¡»ú) ÔÚÖ÷»ú
==== //depot/projects/dtrace/doc/zh_CN.GB2312/books/porters-handbook/book.sgml#27 (text+ko) ====
@@ -2,8 +2,8 @@
The FreeBSD Documentation Project
The FreeBSD Simplified Chinese Project
- Original Revision: 1.919
- $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.37 2008/04/11 10:11:45 loader Exp $
+ Original Revision: 1.924
+ $FreeBSD: doc/zh_CN.GB2312/books/porters-handbook/book.sgml,v 1.38 2008/04/21 06:37:30 loader Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -5088,9 +5088,9 @@
<title>ͨ¹ý Xvfb À´»ñµÃÐéÄâµÄ <envar>DISPLAY</envar></title>
<para>ijЩӦÓóÌÐò±ØÐëÔÚÓпÉÓÃµÄ X11 ÏÔʾµÄʱºò²ÅÄܳɹ¦±àÒë¡£
- Õâ»á¸ø FreeBSD Ô¤±àÒë°ü¹¹½¨¼¯Èº´øÀ´Âé·³£¬ ÒòΪËüÃÇÊDz»½ÓÏÔʾÆ÷µÄ¡£
- ͨ¹ýÏÂÃæµÄ¹Ù·½ hack£¬ Ô¤±àÒë°ü¹¹½¨¼¯Èº½«Æô¶¯²ÉÓÃÐéÄâÖ¡»º´æµÄ
- X server¡£ ÕâÑù£¬ ±àÒë¹ý³Ì½«ÓпÉÓÃµÄ <envar>DISPLAY</envar>¡£</para>
+ µ±±àÒëµÄ»úÆ÷ûÓпØÖÆ̨ʱ£¬ Õâ»á´øÀ´ÎÊÌâ¡£ ΪÁ˽â¾öÕâ¸öÎÊÌ⣬
+ Èç¹û¶¨ÒåÁËÊʵ±µÄ±äÁ¿£¬ Áª±à»ù´¡ÉèÊ©»áÆô¶¯²ÉÓÃÐéÄâÖ¡»º´æµÄ
+ X server¡£ ´Ëʱ£¬ ±àÒë¹ý³ÌÖн«»á´«³ö¿ÉÓÃµÄ <envar>DISPLAY</envar>¡£</para>
<programlisting>USE_DISPLAY= yes</programlisting>
@@ -11107,6 +11107,22 @@
</row>
<row>
+ <entry>Ϊ flock ½á¹¹¼ÓÈë l_sysid Ö®ºóµÄ 7.0-STABLE¡£</entry>
+ <entry>700103</entry>
+ </row>
+
+ <row>
+ <entry>ÔÚ procstat(1) MFC Ö®ºóµÄ 7.0-STABLE¡£</entry>
+ <entry>700104</entry>
+ </row>
+
+ <row>
+ <entry>Ϊ &man.fcntl.2; MFC F_DUP2FD Ö®ºóµÄ
+ 7.0-STABLE¡£</entry>
+ <entry>700107</entry>
+ </row>
+
+ <row>
<entry>8.0-CURRENT¡£ ·Ö²ðÁË¿í×Ö·ûºÍµ¥×Ö½Ú×Ö·û
ctype¡£</entry>
<entry>800000</entry>
@@ -11303,6 +11319,11 @@
º¯ÊýÖ®ºóµÄ 8.0-CURRENT¡£</entry>
<entry>800034</entry>
</row>
+ <row>
+ <entry>ÒýÈë <function>fdopendir</function>
+ º¯ÊýÖ®ºóµÄ 8.0-CURRENT</entry>
+ <entry>800035</entry>
+ </row>
</tbody>
</tgroup>
</table>
==== //depot/projects/dtrace/src/contrib/gcc/gthr-posix.h#5 (text+ko) ====
@@ -152,9 +152,12 @@
it is passed so we cannot pretend that the interface is active if -pthreads
is not specified. On Solaris 2.5.1, the interface is not exposed at all so
we need to play the usual game with weak symbols. On Solaris 10 and up, a
- working interface is always exposed. */
+ working interface is always exposed. On FreeBSD 6 and later, libc also
+ exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up
+ to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc,
+ which means the alternate __gthread_active_p below cannot be used there. */
-#if defined(__sun) && defined(__svr4__)
+#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__))
static volatile int __gthread_active = -1;
@@ -197,7 +200,7 @@
return __gthread_active_latest_value != 0;
}
-#else /* not Solaris */
+#else /* neither FreeBSD nor Solaris */
static inline int
__gthread_active_p (void)
@@ -207,7 +210,7 @@
return __gthread_active_ptr != 0;
}
-#endif /* Solaris */
+#endif /* FreeBSD or Solaris */
#else /* not SUPPORTS_WEAK */
==== //depot/projects/dtrace/src/contrib/netcat/FREEBSD-upgrade#4 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.1 2005/02/06 15:26:44 delphij Exp $
+$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.2 2008/04/21 18:37:08 delphij Exp $
1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc").
2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist
@@ -9,9 +9,11 @@
6. If there is conflicits, try to resolve them.
7. do build in f-nc/../../usr.bin/nc
8. If everything seems ok, do the actual import in v-nc:
- cvs -n import src/contrib/netcat OPENBSD OPENBSD_<date>
+ cvs -n import src/contrib/netcat OPENBSD OPENBSD_<release>
Everything appears be Ok? Do:
- cvs import src/contrib/netcat OPENBSD OPENBSD_<date>
+ cvs import src/contrib/netcat OPENBSD OPENBSD_<release>
+ (note: recently we import from OpenBSD's release branches
+ rather than importing -HEAD snapshots)
9. Resolve the conflicits with the patchset obtained in step 6.
-delphij@FreeBSD.org - 06 Feb 2005
+delphij@FreeBSD.org - 21 Apr 2008
==== //depot/projects/dtrace/src/contrib/netcat/atomicio.c#4 (text+ko) ====
@@ -1,7 +1,7 @@
-/* $OpenBSD: atomicio.c,v 1.8 2006/02/11 19:31:18 otto Exp $ */
-
+/* $OpenBSD: atomicio.c,v 1.9 2007/09/07 14:50:44 tobias Exp $ */
/*
- * Copyright (c) 2005 Anil Madhavapeddy. All rights served.
+ * Copyright (c) 2006 Damien Miller. All rights reserved.
+ * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
* Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
* All rights reserved.
*
@@ -26,32 +26,37 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
-#include <sys/uio.h>
+#include <sys/param.h>
+
#include <errno.h>
+#include <poll.h>
#include <unistd.h>
+
#include "atomicio.h"
/*
* ensure all of data on socket comes through. f==read || f==vwrite
*/
size_t
-atomicio(f, fd, _s, n)
- ssize_t (*f) (int, void *, size_t);
- int fd;
- void *_s;
- size_t n;
+atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
{
char *s = _s;
size_t pos = 0;
ssize_t res;
+ struct pollfd pfd;
+ pfd.fd = fd;
+ pfd.events = f == read ? POLLIN : POLLOUT;
while (n > pos) {
res = (f) (fd, s + pos, n - pos);
switch (res) {
case -1:
- if (errno == EINTR || errno == EAGAIN)
+ if (errno == EINTR)
+ continue;
+ if (errno == EAGAIN) {
+ (void)poll(&pfd, 1, -1);
continue;
+ }
return 0;
case 0:
errno = EPIPE;
@@ -60,5 +65,5 @@
pos += (size_t)res;
}
}
- return pos;
+ return (pos);
}
==== //depot/projects/dtrace/src/contrib/netcat/atomicio.h#3 (text) ====
@@ -1,6 +1,7 @@
-/* $OpenBSD: atomicio.h,v 1.1 2005/05/24 20:13:28 avsm Exp $ */
+/* $OpenBSD: atomicio.h,v 1.2 2007/09/07 14:50:44 tobias Exp $ */
/*
+ * Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
* All rights reserved.
*
@@ -25,9 +26,14 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _ATOMICIO_H
+#define _ATOMICIO_H
+
/*
* Ensure all of data on socket comes through. f==read || f==vwrite
*/
size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
#define vwrite (ssize_t (*)(int, void *, size_t))write
+
+#endif /* _ATOMICIO_H */
==== //depot/projects/dtrace/src/contrib/netcat/nc.1#6 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.44 2006/12/02 01:08:30 jmc Exp $
+.\" $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $
.\"
.\" Copyright (c) 1996 David Sacerdote
.\" All rights reserved.
@@ -25,9 +25,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.8 2008/04/01 13:54:24 bms Exp $
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.9 2008/04/21 18:31:50 delphij Exp $
.\"
-.Dd April 2, 2008
+.Dd $Mdocdate$
.Dt NC 1
.Os
.Sh NAME
==== //depot/projects/dtrace/src/etc/defaults/rc.conf#32 (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.331 2008/04/20 20:37:20 sam Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.332 2008/04/21 18:17:48 brooks Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -33,7 +33,7 @@
apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO).
apmd_enable="NO" # Run apmd to handle APM event from userland.
apmd_flags="" # Flags to apmd (if enabled).
-ddb_enable="NO" # Set to YES to load ddb scripts at boot.
+ddb_enable="YES" # Load ddb scripts at boot.
ddb_config="/etc/ddb.conf" # ddb(8) config file.
devd_enable="YES" # Run devd, to trigger programs on device tree changes.
devd_flags="" # Additional flags for devd(8).
==== //depot/projects/dtrace/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#6 (text+ko) ====
@@ -18,7 +18,7 @@
<corpauthor>The &os; Documentation Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.329 2008/02/03 09:43:08 brueffer Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/article.sgml,v 1.330 2008/04/21 05:43:07 brueffer Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -764,8 +764,6 @@
&hwlist.ath;
- &hwlist.awi;
-
&hwlist.cnw;
<para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI network
==== //depot/projects/dtrace/src/release/doc/share/misc/dev.archlist.txt#18 (text+ko) ====
@@ -23,7 +23,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.104 2008/03/11 08:28:44 brueffer Exp $
+# $FreeBSD: src/release/doc/share/misc/dev.archlist.txt,v 1.105 2008/04/21 05:43:08 brueffer Exp $
#
#
@@ -47,7 +47,6 @@
asr i386
ath i386,pc98,amd64,sparc64
aue i386,pc98,ia64,amd64,powerpc
-awi i386,pc98,amd64
axe i386,pc98,amd64,powerpc
bce i386,amd64
bge i386,pc98,sparc64,ia64,amd64
==== //depot/projects/dtrace/src/share/man/man4/textdump.4#3 (text+ko) ====
@@ -25,7 +25,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH
.\" DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.3 2008/01/07 16:47:30 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.4 2008/04/21 17:09:53 rwatson Exp $
.\"
.Dd December 26, 2007
.Dt textdump 4
@@ -48,7 +48,7 @@
By combining
.Nm
with other
-.Xr DDB 4
+.Xr ddb 4
facilities, such as scripting and output capture, detailed bug information
can be captured in a fully automated manner.
.Sh FORMAT
@@ -67,7 +67,7 @@
.Bl -tag -width version.txt
.It Pa ddb.txt
Captured
-.Xr DDB 4
+.Xr ddb 4
output, if the capture facility has been used.
May be disabled by clearing the
.Dv debug.ddb.textdump.do_ddb
@@ -110,7 +110,7 @@
dump will be regular memory dumps; however, by using the
.Ic textdump set
command in
-.Xr DDB 4 ,
+.Xr ddb 4 ,
or by setting the
.Dv debug.ddb.textdump.pending
sysctl to 1 using
@@ -118,7 +118,7 @@
it is possible to request that the next dump be a textdump.
.Pp
If at the
-.Xr DDB 4
+.Xr ddb 4
command line, the commands
.Ic textdump set ,
.Ic textdump status ,
==== //depot/projects/dtrace/src/sys/arm/conf/AVILA#10 (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/arm/conf/AVILA,v 1.12 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.13 2008/04/21 10:09:54 phk Exp $
machine arm
ident AVILA
@@ -80,7 +80,6 @@
#options PREEMPTION
#options VERBOSE_SYSINIT
-device genclock
device mem # Memory and kernel memory devices
#device saarm
==== //depot/projects/dtrace/src/sys/arm/conf/BWCT#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/BWCT,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident BWCT
@@ -68,7 +68,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device loop
device random
device ether
==== //depot/projects/dtrace/src/sys/arm/conf/CRB#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CRB,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident CRB
@@ -65,7 +65,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/dtrace/src/sys/arm/conf/EP80219#7 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/EP80219,v 1.7 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $
machine arm
ident EP80219
@@ -67,7 +67,6 @@
options BOOTP_WIRED_TO=fxp0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/dtrace/src/sys/arm/conf/HL200#5 (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/arm/conf/HL200,v 1.4 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident HL200
@@ -74,7 +74,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
==== //depot/projects/dtrace/src/sys/arm/conf/IQ31244#9 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.21 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $
machine arm
ident IQ31244
@@ -64,7 +64,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/dtrace/src/sys/arm/conf/KB920X#12 (text) ====
@@ -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/arm/conf/KB920X,v 1.16 2008/04/20 20:35:34 sam Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.17 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -62,7 +62,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
==== //depot/projects/dtrace/src/sys/arm/conf/SIMICS#9 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.15 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $
machine arm
ident SIMICS
@@ -54,7 +54,6 @@
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-device genclock
device loop
device ether
device saip
==== //depot/projects/dtrace/src/sys/arm/conf/SKYEYE#9 (text) ====
@@ -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/arm/conf/SKYEYE,v 1.9 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -59,7 +59,6 @@
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-device genclock
device loop
device ether
#device saarm
==== //depot/projects/dtrace/src/sys/compat/svr4/svr4_misc.c#12 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.100 2008/01/13 14:44:01 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.101 2008/04/21 21:24:08 rdivacky Exp $");
#include "opt_mac.h"
@@ -898,9 +898,7 @@
if (r == -1)
r = 0x7fffffff;
- mtx_lock(&Giant); /* XXX */
r += (long) vm->vm_daddr;
- mtx_unlock(&Giant);
if (r < 0)
r = 0x7fffffff;
*retval = r;
==== //depot/projects/dtrace/src/sys/conf/files#85 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1293 2008/04/20 20:35:35 sam Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1425,7 +1425,7 @@
fs/cd9660/cd9660_vnops.c optional cd9660
fs/cd9660/cd9660_iconv.c optional cd9660_iconv
kern/bus_if.m standard
-kern/clock_if.m optional genclock
+kern/clock_if.m standard
kern/cpufreq_if.m standard
kern/device_if.m standard
kern/imgact_elf.c standard
@@ -1527,7 +1527,7 @@
kern/subr_prf.c standard
kern/subr_prof.c standard
kern/subr_rman.c standard
-kern/subr_rtc.c optional genclock
+kern/subr_rtc.c standard
kern/subr_sbuf.c standard
kern/subr_scanf.c standard
kern/subr_sleepqueue.c standard
==== //depot/projects/dtrace/src/sys/conf/files.amd64#29 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.amd64,v 1.120 2008/04/14 07:59:59 phk Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.121 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -210,9 +210,7 @@
isa/atrtc.c standard
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
-kern/clock_if.m standard
kern/link_elf_obj.c standard
-kern/subr_rtc.c standard
#
# IA32 binary support
#
==== //depot/projects/dtrace/src/sys/conf/files.i386#34 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.i386,v 1.594 2008/04/14 07:59:59 phk Exp $
+# $FreeBSD: src/sys/conf/files.i386,v 1.595 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -446,10 +446,8 @@
isa/atrtc.c standard
isa/syscons_isa.c optional sc
isa/vga_isa.c optional vga
-kern/clock_if.m standard
kern/imgact_aout.c optional compat_aout
kern/imgact_gzip.c optional gzip
-kern/subr_rtc.c standard
libkern/divdi3.c standard
libkern/ffsl.c standard
libkern/flsl.c standard
==== //depot/projects/dtrace/src/sys/conf/files.pc98#20 (text+ko) ====
@@ -3,7 +3,7 @@
#
# modified for PC-9801/PC-9821
#
-# $FreeBSD: src/sys/conf/files.pc98,v 1.361 2008/04/19 08:18:47 nyan Exp $
+# $FreeBSD: src/sys/conf/files.pc98,v 1.362 2008/04/21 10:09:53 phk Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -314,10 +314,8 @@
i4b/layer1/itjc/i4b_itjc_l1.c optional itjc
i4b/layer1/itjc/i4b_itjc_l1fsm.c optional itjc
#
-kern/clock_if.m standard
kern/imgact_aout.c optional compat_aout
kern/imgact_gzip.c optional gzip
-kern/subr_rtc.c standard
libkern/divdi3.c standard
libkern/ffsl.c standard
libkern/flsl.c standard
==== //depot/projects/dtrace/src/sys/dev/ata/ata-chipset.c#28 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.217 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-chipset.c,v 1.219 2008/04/21 10:51:38 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -694,7 +694,7 @@
ATA_AHCI_P_IX_PS | ATA_AHCI_P_IX_DHR));
/* enable FIS based switching */
- ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003);
+ //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, 0x00000003);
/* start operations on this channel */
ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CMD + offset,
@@ -820,7 +820,7 @@
~ATA_AHCI_P_CMD_ATAPI);
/* set PM port to address */
- ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001);
+ //ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_FBS + offset, (port << 8) | 0x00000001);
/* issue command to controller */
ATA_OUTL(ctlr->r_res2, ATA_AHCI_P_CI + offset, (1 << request->tag));
@@ -1638,6 +1638,27 @@
/*
+ * Adaptec chipset support functions
+ */
+int
+ata_adaptec_ident(device_t dev)
+{
+ struct ata_pci_controller *ctlr = device_get_softc(dev);
+ static struct ata_chip_id ids[] =
+ {{ ATA_ADAPTEC_1420, 0, 4, MV60XX, ATA_SA300, "1420SA" },
+ { 0, 0, 0, 0, 0, 0}};
+
+ if (!(ctlr->chip = ata_match_chip(dev, ids)))
+ return ENXIO;
+
+ ata_set_desc(dev);
+ ctlr->chipinit = ata_marvell_edma_chipinit;
+
+ return 0;
+}
+
+
+/*
* ATI chipset support functions
*/
int
==== //depot/projects/dtrace/src/sys/dev/ata/ata-pci.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.126 2008/04/17 12:29:35 sos Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/ata/ata-pci.c,v 1.127 2008/04/21 10:51:38 sos Exp $");
#include "opt_ata.h"
#include <sys/param.h>
@@ -96,6 +96,10 @@
if (!ata_amd_ident(dev))
return ATA_PROBE_OK;
break;
+ case ATA_ADAPTEC_ID:
+ if (!ata_adaptec_ident(dev))
+ return ATA_PROBE_OK;
+ break;
case ATA_ATI_ID:
if (!ata_ati_ident(dev))
return ATA_PROBE_OK;
@@ -523,6 +527,7 @@
case ATA_ACARD_ID: return "Acard";
case ATA_ACER_LABS_ID: return "AcerLabs";
case ATA_AMD_ID: return "AMD";
+ case ATA_ADAPTEC_ID: return "Adaptec";
case ATA_ATI_ID: return "ATI";
case ATA_CYRIX_ID: return "Cyrix";
case ATA_CYPRESS_ID: return "Cypress";
==== //depot/projects/dtrace/src/sys/dev/ata/ata-pci.h#16 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.85 2008/04/12 17:21:22 sos Exp $
+ * $FreeBSD: src/sys/dev/ata/ata-pci.h,v 1.86 2008/04/21 10:51:38 sos Exp $
*/
/* structure holding chipset config info */
@@ -80,6 +80,14 @@
#define ATA_ATP865A 0x00081191
#define ATA_ATP865R 0x00091191
+#define ATA_ACER_LABS_ID 0x10b9
+#define ATA_ALI_1533 0x153310b9
+#define ATA_ALI_5229 0x522910b9
+#define ATA_ALI_5281 0x528110b9
+#define ATA_ALI_5287 0x528710b9
+#define ATA_ALI_5288 0x528810b9
+#define ATA_ALI_5289 0x528910b9
+
#define ATA_AMD_ID 0x1022
#define ATA_AMD755 0x74011022
#define ATA_AMD756 0x74091022
@@ -88,13 +96,8 @@
#define ATA_AMD8111 0x74691022
#define ATA_AMD5536 0x209a1022
-#define ATA_ACER_LABS_ID 0x10b9
-#define ATA_ALI_1533 0x153310b9
-#define ATA_ALI_5229 0x522910b9
-#define ATA_ALI_5281 0x528110b9
-#define ATA_ALI_5287 0x528710b9
-#define ATA_ALI_5288 0x528810b9
-#define ATA_ALI_5289 0x528910b9
+#define ATA_ADAPTEC_ID 0x9005
+#define ATA_ADAPTEC_1420 0x02419005
#define ATA_ATI_ID 0x1002
#define ATA_ATI_IXP200 0x43491002
@@ -471,6 +474,7 @@
int ata_acard_ident(device_t);
int ata_ali_ident(device_t);
int ata_amd_ident(device_t);
+int ata_adaptec_ident(device_t);
int ata_ati_ident(device_t);
int ata_cyrix_ident(device_t);
int ata_cypress_ident(device_t);
==== //depot/projects/dtrace/src/sys/dev/ata/ata-queue.c#10 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 05:08:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 60B621065671; Tue, 22 Apr 2008 05:08:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 21AD8106566C
for <perforce@freebsd.org>; Tue, 22 Apr 2008 05:08:24 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 128EF8FC1C
for <perforce@freebsd.org>; Tue, 22 Apr 2008 05:08:19 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3M58JRd094994
for <perforce@freebsd.org>; Tue, 22 Apr 2008 05:08:19 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M58Isp094992
for perforce@freebsd.org; Tue, 22 Apr 2008 05:08:18 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 05:08:18 GMT
Message-Id: <200804220508.m3M58Isp094992@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140383 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 05:08:24 -0000
http://perforce.freebsd.org/chv.cgi?CH=140383
Change 140383 by jb@freebsd3 on 2008/04/22 05:08:02
IFopensolaris
Affected files ...
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh.out#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_DEPEND.main.d#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libchain.ksh#1 branch
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/debug.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#2 integrate
Differences ...
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#2 (text+ko) ====
@@ -20,18 +20,20 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
#pragma D option quiet
+#pragma D option strsize=32
struct {
int index;
int length;
int nolen;
+ int alt;
} command[int];
int i;
@@ -39,6 +41,9 @@
BEGIN
{
str = "foobarbazbop";
+ str2 = "";
+ altstr = "CRAIG: Positioned them, I don't ";
+ altstr2 = "know... I'm fairly wide guy.";
command[i].index = 3;
command[i].nolen = 1;
@@ -108,6 +113,18 @@
command[i].length = -1;
i++;
+ command[i].index = 3;
+ command[i].length = -4;
+ i++;
+
+ command[i].index = 3;
+ command[i].length = -20;
+ i++;
+
+ command[i].index = -10;
+ command[i].length = -5;
+ i++;
+
command[i].index = 0;
command[i].length = 400;
i++;
@@ -144,6 +161,16 @@
command[i].length = strlen(str) - 1;
i++;
+ command[i].index = 100;
+ command[i].length = 10;
+ command[i].alt = 1;
+ i++;
+
+ command[i].index = 100;
+ command[i].nolen = 1;
+ command[i].alt = 1;
+ i++;
+
end = i;
i = 0;
printf("#!/usr/perl5/bin/perl\n\nBEGIN {\n");
@@ -153,17 +180,21 @@
tick-1ms
/i < end && command[i].nolen/
{
- this->result = substr(str, command[i].index);
+ this->str = command[i].alt ? altstr : str;
+ this->str2 = command[i].alt ? altstr2 : str2;
+ this->result = substr(command[i].alt ?
+ "CRAIG: Positioned them, I don't know... I'm fairly wide guy." :
+ str, command[i].index);
- printf("\tif (substr(\"%s\", %d) != \"%s\") {\n",
- str, command[i].index, this->result);
+ printf("\tif (substr(\"%s%s\", %d) ne \"%s\") {\n",
+ this->str, this->str2, command[i].index, this->result);
- printf("\t\tprintf(\"perl => substr(\\\"%s\\\", %d) = ",
- str, command[i].index);
- printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s\", %d));\n",
- str, command[i].index);
- printf("\t\tprintf(\" D => substr(\\\"%s\\\", %d) = ",
- str, command[i].index);
+ printf("\t\tprintf(\"perl => substr(\\\"%s%s\\\", %d) = ",
+ this->str, this->str2, command[i].index);
+ printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s%s\", %d));\n",
+ this->str, this->str2, command[i].index);
+ printf("\t\tprintf(\" D => substr(\\\"%s%s\\\", %d) = ",
+ this->str, this->str2, command[i].index);
printf("\\\"%%s\\\"\\n\",\n\t\t \"%s\");\n", this->result);
printf("\t\t$failed++;\n");
printf("\t}\n\n");
@@ -172,16 +203,21 @@
tick-1ms
/i < end && !command[i].nolen/
{
- this->result = substr(str, command[i].index, command[i].length);
+ this->str = command[i].alt ? altstr : str;
+ this->str2 = command[i].alt ? altstr2 : str2;
+ this->result = substr(command[i].alt ?
+ "CRAIG: Positioned them, I don't know... I'm fairly wide guy." :
+ str, command[i].index, command[i].length);
- printf("\tif (substr(\"%s\", %d, %d) != \"%s\") {\n",
- str, command[i].index, command[i].length, this->result);
- printf("\t\tprintf(\"perl => substr(\\\"%s\\\", %d, %d) = ",
- str, command[i].index, command[i].length);
- printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s\", %d, %d));\n",
- str, command[i].index, command[i].length);
- printf("\t\tprintf(\" D => substr(\\\"%s\\\", %d, %d) = ",
- str, command[i].index, command[i].length);
+ printf("\tif (substr(\"%s%s\", %d, %d) ne \"%s\") {\n",
+ this->str, this->str2, command[i].index, command[i].length,
+ this->result);
+ printf("\t\tprintf(\"perl => substr(\\\"%s%s\\\", %d, %d) = ",
+ this->str, this->str2, command[i].index, command[i].length);
+ printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s%s\", %d, %d));\n",
+ this->str, this->str2, command[i].index, command[i].length);
+ printf("\t\tprintf(\" D => substr(\\\"%s%s\\\", %d, %d) = ",
+ this->str, this->str2, command[i].index, command[i].length);
printf("\\\"%%s\\\"\\n\",\n\t\t \"%s\");\n", this->result);
printf("\t\t$failed++;\n");
printf("\t}\n\n");
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#2 (text+ko) ====
@@ -1,7 +1,7 @@
#!/usr/perl5/bin/perl
BEGIN {
- if (substr("foobarbazbop", 3) != "barbazbop") {
+ if (substr("foobarbazbop", 3) ne "barbazbop") {
printf("perl => substr(\"foobarbazbop\", 3) = \"%s\"\n",
substr("foobarbazbop", 3));
printf(" D => substr(\"foobarbazbop\", 3) = \"%s\"\n",
@@ -9,7 +9,7 @@
$failed++;
}
- if (substr("foobarbazbop", 300) != "") {
+ if (substr("foobarbazbop", 300) ne "") {
printf("perl => substr(\"foobarbazbop\", 300) = \"%s\"\n",
substr("foobarbazbop", 300));
printf(" D => substr(\"foobarbazbop\", 300) = \"%s\"\n",
@@ -17,7 +17,7 @@
$failed++;
}
- if (substr("foobarbazbop", -10) != "obarbazbop") {
+ if (substr("foobarbazbop", -10) ne "obarbazbop") {
printf("perl => substr(\"foobarbazbop\", -10) = \"%s\"\n",
substr("foobarbazbop", -10));
printf(" D => substr(\"foobarbazbop\", -10) = \"%s\"\n",
@@ -25,7 +25,7 @@
$failed++;
}
- if (substr("foobarbazbop", 0) != "foobarbazbop") {
+ if (substr("foobarbazbop", 0) ne "foobarbazbop") {
printf("perl => substr(\"foobarbazbop\", 0) = \"%s\"\n",
substr("foobarbazbop", 0));
printf(" D => substr(\"foobarbazbop\", 0) = \"%s\"\n",
@@ -33,7 +33,7 @@
$failed++;
}
- if (substr("foobarbazbop", 1) != "oobarbazbop") {
+ if (substr("foobarbazbop", 1) ne "oobarbazbop") {
printf("perl => substr(\"foobarbazbop\", 1) = \"%s\"\n",
substr("foobarbazbop", 1));
printf(" D => substr(\"foobarbazbop\", 1) = \"%s\"\n",
@@ -41,7 +41,7 @@
$failed++;
}
- if (substr("foobarbazbop", 11) != "p") {
+ if (substr("foobarbazbop", 11) ne "p") {
printf("perl => substr(\"foobarbazbop\", 11) = \"%s\"\n",
substr("foobarbazbop", 11));
printf(" D => substr(\"foobarbazbop\", 11) = \"%s\"\n",
@@ -49,7 +49,7 @@
$failed++;
}
- if (substr("foobarbazbop", 12) != "") {
+ if (substr("foobarbazbop", 12) ne "") {
printf("perl => substr(\"foobarbazbop\", 12) = \"%s\"\n",
substr("foobarbazbop", 12));
printf(" D => substr(\"foobarbazbop\", 12) = \"%s\"\n",
@@ -57,7 +57,7 @@
$failed++;
}
- if (substr("foobarbazbop", 13) != "") {
+ if (substr("foobarbazbop", 13) ne "") {
printf("perl => substr(\"foobarbazbop\", 13) = \"%s\"\n",
substr("foobarbazbop", 13));
printf(" D => substr(\"foobarbazbop\", 13) = \"%s\"\n",
@@ -65,7 +65,7 @@
$failed++;
}
- if (substr("foobarbazbop", 8, 20) != "zbop") {
+ if (substr("foobarbazbop", 8, 20) ne "zbop") {
printf("perl => substr(\"foobarbazbop\", 8, 20) = \"%s\"\n",
substr("foobarbazbop", 8, 20));
printf(" D => substr(\"foobarbazbop\", 8, 20) = \"%s\"\n",
@@ -73,7 +73,7 @@
$failed++;
}
- if (substr("foobarbazbop", 4, 4) != "arba") {
+ if (substr("foobarbazbop", 4, 4) ne "arba") {
printf("perl => substr(\"foobarbazbop\", 4, 4) = \"%s\"\n",
substr("foobarbazbop", 4, 4));
printf(" D => substr(\"foobarbazbop\", 4, 4) = \"%s\"\n",
@@ -81,7 +81,7 @@
$failed++;
}
- if (substr("foobarbazbop", 5, 8) != "rbazbop") {
+ if (substr("foobarbazbop", 5, 8) ne "rbazbop") {
printf("perl => substr(\"foobarbazbop\", 5, 8) = \"%s\"\n",
substr("foobarbazbop", 5, 8));
printf(" D => substr(\"foobarbazbop\", 5, 8) = \"%s\"\n",
@@ -89,7 +89,7 @@
$failed++;
}
- if (substr("foobarbazbop", 5, 9) != "rbazbop") {
+ if (substr("foobarbazbop", 5, 9) ne "rbazbop") {
printf("perl => substr(\"foobarbazbop\", 5, 9) = \"%s\"\n",
substr("foobarbazbop", 5, 9));
printf(" D => substr(\"foobarbazbop\", 5, 9) = \"%s\"\n",
@@ -97,7 +97,7 @@
$failed++;
}
- if (substr("foobarbazbop", 400, 20) != "") {
+ if (substr("foobarbazbop", 400, 20) ne "") {
printf("perl => substr(\"foobarbazbop\", 400, 20) = \"%s\"\n",
substr("foobarbazbop", 400, 20));
printf(" D => substr(\"foobarbazbop\", 400, 20) = \"%s\"\n",
@@ -105,7 +105,7 @@
$failed++;
}
- if (substr("foobarbazbop", 400, 0) != "") {
+ if (substr("foobarbazbop", 400, 0) ne "") {
printf("perl => substr(\"foobarbazbop\", 400, 0) = \"%s\"\n",
substr("foobarbazbop", 400, 0));
printf(" D => substr(\"foobarbazbop\", 400, 0) = \"%s\"\n",
@@ -113,7 +113,7 @@
$failed++;
}
- if (substr("foobarbazbop", 400, -1) != "") {
+ if (substr("foobarbazbop", 400, -1) ne "") {
printf("perl => substr(\"foobarbazbop\", 400, -1) = \"%s\"\n",
substr("foobarbazbop", 400, -1));
printf(" D => substr(\"foobarbazbop\", 400, -1) = \"%s\"\n",
@@ -121,7 +121,7 @@
$failed++;
}
- if (substr("foobarbazbop", 3, 0) != "") {
+ if (substr("foobarbazbop", 3, 0) ne "") {
printf("perl => substr(\"foobarbazbop\", 3, 0) = \"%s\"\n",
substr("foobarbazbop", 3, 0));
printf(" D => substr(\"foobarbazbop\", 3, 0) = \"%s\"\n",
@@ -129,15 +129,39 @@
$failed++;
}
- if (substr("foobarbazbop", 3, -1) != "") {
+ if (substr("foobarbazbop", 3, -1) ne "barbazbo") {
printf("perl => substr(\"foobarbazbop\", 3, -1) = \"%s\"\n",
substr("foobarbazbop", 3, -1));
printf(" D => substr(\"foobarbazbop\", 3, -1) = \"%s\"\n",
+ "barbazbo");
+ $failed++;
+ }
+
+ if (substr("foobarbazbop", 3, -4) ne "barba") {
+ printf("perl => substr(\"foobarbazbop\", 3, -4) = \"%s\"\n",
+ substr("foobarbazbop", 3, -4));
+ printf(" D => substr(\"foobarbazbop\", 3, -4) = \"%s\"\n",
+ "barba");
+ $failed++;
+ }
+
+ if (substr("foobarbazbop", 3, -20) ne "") {
+ printf("perl => substr(\"foobarbazbop\", 3, -20) = \"%s\"\n",
+ substr("foobarbazbop", 3, -20));
+ printf(" D => substr(\"foobarbazbop\", 3, -20) = \"%s\"\n",
"");
$failed++;
}
- if (substr("foobarbazbop", 0, 400) != "foobarbazbop") {
+ if (substr("foobarbazbop", -10, -5) ne "obarb") {
+ printf("perl => substr(\"foobarbazbop\", -10, -5) = \"%s\"\n",
+ substr("foobarbazbop", -10, -5));
+ printf(" D => substr(\"foobarbazbop\", -10, -5) = \"%s\"\n",
+ "obarb");
+ $failed++;
+ }
+
+ if (substr("foobarbazbop", 0, 400) ne "foobarbazbop") {
printf("perl => substr(\"foobarbazbop\", 0, 400) = \"%s\"\n",
substr("foobarbazbop", 0, 400));
printf(" D => substr(\"foobarbazbop\", 0, 400) = \"%s\"\n",
@@ -145,7 +169,7 @@
$failed++;
}
- if (substr("foobarbazbop", -1, 400) != "p") {
+ if (substr("foobarbazbop", -1, 400) ne "p") {
printf("perl => substr(\"foobarbazbop\", -1, 400) = \"%s\"\n",
substr("foobarbazbop", -1, 400));
printf(" D => substr(\"foobarbazbop\", -1, 400) = \"%s\"\n",
@@ -153,7 +177,7 @@
$failed++;
}
- if (substr("foobarbazbop", -1, 0) != "") {
+ if (substr("foobarbazbop", -1, 0) ne "") {
printf("perl => substr(\"foobarbazbop\", -1, 0) = \"%s\"\n",
substr("foobarbazbop", -1, 0));
printf(" D => substr(\"foobarbazbop\", -1, 0) = \"%s\"\n",
@@ -161,7 +185,7 @@
$failed++;
}
- if (substr("foobarbazbop", -1, -1) != "") {
+ if (substr("foobarbazbop", -1, -1) ne "") {
printf("perl => substr(\"foobarbazbop\", -1, -1) = \"%s\"\n",
substr("foobarbazbop", -1, -1));
printf(" D => substr(\"foobarbazbop\", -1, -1) = \"%s\"\n",
@@ -169,7 +193,7 @@
$failed++;
}
- if (substr("foobarbazbop", -24, 24) != "foobarbazbop") {
+ if (substr("foobarbazbop", -24, 24) ne "foobarbazbop") {
printf("perl => substr(\"foobarbazbop\", -24, 24) = \"%s\"\n",
substr("foobarbazbop", -24, 24));
printf(" D => substr(\"foobarbazbop\", -24, 24) = \"%s\"\n",
@@ -177,7 +201,7 @@
$failed++;
}
- if (substr("foobarbazbop", -24, 12) != "") {
+ if (substr("foobarbazbop", -24, 12) ne "") {
printf("perl => substr(\"foobarbazbop\", -24, 12) = \"%s\"\n",
substr("foobarbazbop", -24, 12));
printf(" D => substr(\"foobarbazbop\", -24, 12) = \"%s\"\n",
@@ -185,7 +209,7 @@
$failed++;
}
- if (substr("foobarbazbop", -24, 13) != "f") {
+ if (substr("foobarbazbop", -24, 13) ne "f") {
printf("perl => substr(\"foobarbazbop\", -24, 13) = \"%s\"\n",
substr("foobarbazbop", -24, 13));
printf(" D => substr(\"foobarbazbop\", -24, 13) = \"%s\"\n",
@@ -193,7 +217,7 @@
$failed++;
}
- if (substr("foobarbazbop", -12, 12) != "foobarbazbop") {
+ if (substr("foobarbazbop", -12, 12) ne "foobarbazbop") {
printf("perl => substr(\"foobarbazbop\", -12, 12) = \"%s\"\n",
substr("foobarbazbop", -12, 12));
printf(" D => substr(\"foobarbazbop\", -12, 12) = \"%s\"\n",
@@ -201,7 +225,7 @@
$failed++;
}
- if (substr("foobarbazbop", -12, 11) != "foobarbazbo") {
+ if (substr("foobarbazbop", -12, 11) ne "foobarbazbo") {
printf("perl => substr(\"foobarbazbop\", -12, 11) = \"%s\"\n",
substr("foobarbazbop", -12, 11));
printf(" D => substr(\"foobarbazbop\", -12, 11) = \"%s\"\n",
@@ -209,6 +233,22 @@
$failed++;
}
+ if (substr("CRAIG: Positioned them, I don't know... I'm fairly wide guy.", 100, 10) ne "") {
+ printf("perl => substr(\"CRAIG: Positioned them, I don't know... I'm fairly wide guy.\", 100, 10) = \"%s\"\n",
+ substr("CRAIG: Positioned them, I don't know... I'm fairly wide guy.", 100, 10));
+ printf(" D => substr(\"CRAIG: Positioned them, I don't know... I'm fairly wide guy.\", 100, 10) = \"%s\"\n",
+ "");
+ $failed++;
+ }
+
+ if (substr("CRAIG: Positioned them, I don't know... I'm fairly wide guy.", 100) ne "") {
+ printf("perl => substr(\"CRAIG: Positioned them, I don't know... I'm fairly wide guy.\", 100) = \"%s\"\n",
+ substr("CRAIG: Positioned them, I don't know... I'm fairly wide guy.", 100));
+ printf(" D => substr(\"CRAIG: Positioned them, I don't know... I'm fairly wide guy.\", 100) = \"%s\"\n",
+ "");
+ $failed++;
+ }
+
exit($failed);
}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/debug.h#2 (text) ====
@@ -405,6 +405,7 @@
#define Dbg_unused_file Dbg64_unused_file
#define Dbg_unused_lcinterface Dbg64_unused_lcinterface
+#define Dbg_unused_path Dbg64_unused_path
#define Dbg_unused_sec Dbg64_unused_sec
#define Dbg_unused_unref Dbg64_unused_unref
@@ -607,6 +608,7 @@
#define Dbg_unused_file Dbg32_unused_file
#define Dbg_unused_lcinterface Dbg32_unused_lcinterface
+#define Dbg_unused_path Dbg32_unused_path
#define Dbg_unused_sec Dbg32_unused_sec
#define Dbg_unused_unref Dbg32_unused_unref
@@ -676,7 +678,7 @@
extern void Dbg_file_delete(Rt_map *);
extern void Dbg_file_dlclose(Lm_list *, const char *, int);
extern void Dbg_file_dldump(Rt_map *, const char *, int);
-extern void Dbg_file_dlopen(Rt_map *, const char *, int);
+extern void Dbg_file_dlopen(Rt_map *, const char *, int *, int);
extern void Dbg_file_elf(Lm_list *, const char *, ulong_t, ulong_t,
ulong_t, ulong_t, const char *, Aliste);
extern void Dbg_file_filtee(Lm_list *, const char *, const char *, int);
@@ -708,7 +710,7 @@
extern void Dbg_libs_ignore(Lm_list *, const char *);
extern void Dbg_libs_init(Lm_list *, List *, List *);
extern void Dbg_libs_l(Lm_list *, const char *, const char *);
-extern void Dbg_libs_path(Lm_list *, const char *, Half, const char *);
+extern void Dbg_libs_path(Lm_list *, const char *, uint_t, const char *);
extern void Dbg_libs_req(Lm_list *, const char *, const char *,
const char *);
extern void Dbg_libs_update(Lm_list *, List *, List *);
@@ -805,7 +807,8 @@
extern void Dbg_syms_ar_title(Lm_list *, const char *, int);
extern void Dbg_syms_created(Lm_list *, const char *);
extern void Dbg_syms_discarded(Lm_list *, Sym_desc *);
-extern void Dbg_syms_dlsym(Rt_map *, const char *, const char *, int);
+extern void Dbg_syms_dlsym(Rt_map *, const char *, int *, const char *,
+ int);
extern void Dbg_syms_dup_sort_addr(Lm_list *, const char *, const char *,
const char *, Addr);
extern void Dbg_syms_entered(Ofl_desc *, Sym *, Sym_desc *);
@@ -858,6 +861,8 @@
extern void Dbg_unused_file(Lm_list *, const char *, int, uint_t);
extern void Dbg_unused_lcinterface(Rt_map *, Rt_map *, int);
+extern void Dbg_unused_path(Lm_list *, const char *, uint_t, uint_t,
+ const char *);
extern void Dbg_unused_sec(Lm_list *, Is_desc *);
extern void Dbg_unused_unref(Rt_map *, const char *);
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h#3 (text) ====
@@ -24,7 +24,7 @@
* All Rights Reserved
*
*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*
* Global include file for all sgs.
@@ -69,8 +69,14 @@
#ifndef _ASM
-extern const char link_ver_string[]; /* Linker version id */
- /* see libconv/{plat}/vernote.s */
+/*
+ * link_ver_string[] contains a version string for use by the link-editor
+ * and all other linker components. It is found in libconv, and is
+ * generated by sgs/libconv/common/bld_vernote.ksh. That script produces
+ * libconv/{plat}/vernote.s, which is in turn assembled/linked into
+ * libconv.
+ */
+extern const char link_ver_string[];
/*
* Macro to round to next double word boundary.
*/
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#3 (text) ====
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -2106,8 +2106,10 @@
dt_dprintf("skipping library %s: %s\n",
dld->dtld_library,
dtrace_errmsg(dtp, dtrace_errno(dtp)));
- } else
+ } else {
+ dld->dtld_loaded = B_TRUE;
dt_program_destroy(dtp, pgp);
+ }
}
dt_lib_depend_free(dtp);
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#3 (text) ====
@@ -18,6 +18,7 @@
*
* CDDL HEADER END
*/
+
/*
* Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
@@ -193,6 +194,7 @@
char *dtld_libpath; /* library pathname */
uint_t dtld_finish; /* completion time in tsort for lib */
uint_t dtld_start; /* starting time in tsort for lib */
+ uint_t dtld_loaded; /* boolean: is this library loaded */
dt_list_t dtld_dependencies; /* linked-list of lib dependencies */
dt_list_t dtld_dependents; /* linked-list of lib dependents */
} dt_lib_depend_t;
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#3 (text) ====
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -942,7 +942,9 @@
#elif defined(__i386) || defined(__amd64)
#define DT_OP_NOP 0x90
+#define DT_OP_RET 0xc3
#define DT_OP_CALL 0xe8
+#define DT_OP_JMP32 0xe9
#define DT_OP_REX_RAX 0x48
#define DT_OP_XOR_EAX_0 0x33
#define DT_OP_XOR_EAX_1 0xc0
@@ -952,6 +954,7 @@
uint32_t *off)
{
uint8_t *ip = (uint8_t *)(p + rela->r_offset - 1);
+ uint8_t ret;
/*
* On x86, the first byte of the instruction is the call opcode and
@@ -975,38 +978,43 @@
* We may have already processed this object file in an earlier linker
* invocation. Check to see if the present instruction sequence matches
* the one we would install. For is-enabled probes, we advance the
- * offset to the first nop instruction in the sequence.
+ * offset to the first nop instruction in the sequence to match the
+ * text modification code below.
*/
if (!isenabled) {
- if (ip[0] == DT_OP_NOP && ip[1] == DT_OP_NOP &&
- ip[2] == DT_OP_NOP && ip[3] == DT_OP_NOP &&
- ip[4] == DT_OP_NOP)
+ if ((ip[0] == DT_OP_NOP || ip[0] == DT_OP_RET) &&
+ ip[1] == DT_OP_NOP && ip[2] == DT_OP_NOP &&
+ ip[3] == DT_OP_NOP && ip[4] == DT_OP_NOP)
return (0);
} else if (dtp->dt_oflags & DTRACE_O_LP64) {
if (ip[0] == DT_OP_REX_RAX &&
ip[1] == DT_OP_XOR_EAX_0 && ip[2] == DT_OP_XOR_EAX_1 &&
- ip[3] == DT_OP_NOP && ip[4] == DT_OP_NOP) {
+ (ip[3] == DT_OP_NOP || ip[3] == DT_OP_RET) &&
+ ip[4] == DT_OP_NOP) {
(*off) += 3;
return (0);
}
} else {
if (ip[0] == DT_OP_XOR_EAX_0 && ip[1] == DT_OP_XOR_EAX_1 &&
- ip[2] == DT_OP_NOP && ip[3] == DT_OP_NOP &&
- ip[4] == DT_OP_NOP) {
+ (ip[2] == DT_OP_NOP || ip[2] == DT_OP_RET) &&
+ ip[3] == DT_OP_NOP && ip[4] == DT_OP_NOP) {
(*off) += 2;
return (0);
}
}
/*
- * We only expect a call instrution with a 32-bit displacement.
+ * We expect either a call instrution with a 32-bit displacement or a
+ * jmp instruction with a 32-bit displacement acting as a tail-call.
*/
- if (ip[0] != DT_OP_CALL) {
- dt_dprintf("found %x instead of a call instruction at %llx\n",
- ip[0], (u_longlong_t)rela->r_offset);
+ if (ip[0] != DT_OP_CALL && ip[0] != DT_OP_JMP32) {
+ dt_dprintf("found %x instead of a call or jmp instruction at "
+ "%llx\n", ip[0], (u_longlong_t)rela->r_offset);
return (-1);
}
+ ret = (ip[0] == DT_OP_JMP32) ? DT_OP_RET : DT_OP_NOP;
+
/*
* Establish the instruction sequence -- all nops for probes, and an
* instruction to clear the return value register (%eax/%rax) followed
@@ -1015,7 +1023,7 @@
* for more readable disassembly when the probe is enabled.
*/
if (!isenabled) {
- ip[0] = DT_OP_NOP;
+ ip[0] = ret;
ip[1] = DT_OP_NOP;
ip[2] = DT_OP_NOP;
ip[3] = DT_OP_NOP;
@@ -1024,13 +1032,13 @@
ip[0] = DT_OP_REX_RAX;
ip[1] = DT_OP_XOR_EAX_0;
ip[2] = DT_OP_XOR_EAX_1;
- ip[3] = DT_OP_NOP;
+ ip[3] = ret;
ip[4] = DT_OP_NOP;
(*off) += 3;
} else {
ip[0] = DT_OP_XOR_EAX_0;
ip[1] = DT_OP_XOR_EAX_1;
- ip[2] = DT_OP_NOP;
+ ip[2] = ret;
ip[3] = DT_OP_NOP;
ip[4] = DT_OP_NOP;
(*off) += 2;
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#3 (text) ====
@@ -114,8 +114,9 @@
#define DT_VERS_1_4_1 DT_VERSION_NUMBER(1, 4, 1)
#define DT_VERS_1_5 DT_VERSION_NUMBER(1, 5, 0)
#define DT_VERS_1_6 DT_VERSION_NUMBER(1, 6, 0)
-#define DT_VERS_LATEST DT_VERS_1_6
-#define DT_VERS_STRING "Sun D 1.6"
+#define DT_VERS_1_6_1 DT_VERSION_NUMBER(1, 6, 1)
+#define DT_VERS_LATEST DT_VERS_1_6_1
+#define DT_VERS_STRING "Sun D 1.6.1"
const dt_version_t _dtrace_versions[] = {
DT_VERS_1_0, /* D API 1.0.0 (PSARC 2001/466) Solaris 10 FCS */
@@ -128,6 +129,7 @@
DT_VERS_1_4_1, /* D API 1.4.1 Solaris Express 4/07 */
DT_VERS_1_5, /* D API 1.5 Solaris Express 7/07 */
DT_VERS_1_6, /* D API 1.6 */
+ DT_VERS_1_6_1, /* D API 1.6.1 */
0
};
@@ -1545,6 +1547,9 @@
dt_dirpath_t *dirp;
int i;
+ if (dtp->dt_procs != NULL)
+ dt_proc_hash_destroy(dtp);
+
while ((pgp = dt_list_next(&dtp->dt_programs)) != NULL)
dt_program_destroy(dtp, pgp);
@@ -1573,9 +1578,6 @@
while ((pvp = dt_list_next(&dtp->dt_provlist)) != NULL)
dt_provider_destroy(dtp, pvp);
- if (dtp->dt_procs != NULL)
- dt_proc_hash_destroy(dtp);
-
if (dtp->dt_fd != -1)
(void) close(dtp->dt_fd);
if (dtp->dt_ftfd != -1)
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#3 (text) ====
@@ -768,7 +768,13 @@
assert(dpr != NULL);
(void) pthread_mutex_lock(&dpr->dpr_lock);
- err = dt_pid_create_pid_probes(pdp, dtp, pcb, dpr);
+ if ((err = dt_pid_create_pid_probes(pdp, dtp, pcb, dpr)) == 0) {
+ /*
+ * Alert other retained enablings which may match
+ * against the newly created probes.
+ */
+ (void) dt_ioctl(dtp, DTRACEIOC_ENABLE, NULL);
+ }
(void) pthread_mutex_unlock(&dpr->dpr_lock);
dt_proc_release(dtp, P);
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#3 (text) ====
@@ -18,8 +18,9 @@
*
* CDDL HEADER END
*/
+
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -212,6 +213,7 @@
dt_node_t *nnp = cnp ? cnp->dn_list : NULL;
int found;
dt_lib_depend_t *dld;
+ char lib[MAXPATHLEN];
if (cnp == NULL || nnp == NULL ||
cnp->dn_kind != DT_NODE_IDENT || nnp->dn_kind != DT_NODE_IDENT) {
@@ -225,29 +227,53 @@
dt_module_t *mp = dt_module_lookup_by_name(dtp, nnp->dn_string);
found = mp != NULL && dt_module_getctf(dtp, mp) != NULL;
} else if (strcmp(cnp->dn_string, "library") == 0) {
-
- /*
- * We have the file we are working on in dtp->dt_filetag
- * so find that node and add the dependency in.
- */
if (yypcb->pcb_cflags & DTRACE_C_CTL) {
- char lib[MAXPATHLEN];
+ assert(dtp->dt_filetag != NULL);
+ /*
+ * We have the file we are working on in dtp->dt_filetag
+ * so find that node and add the dependency in.
+ */
dld = dt_lib_depend_lookup(&dtp->dt_lib_dep,
dtp->dt_filetag);
assert(dld != NULL);
- (void) snprintf(lib, MAXPATHLEN, "%s%s",
+ (void) snprintf(lib, sizeof (lib), "%s%s",
dld->dtld_libpath, nnp->dn_string);
if ((dt_lib_depend_add(dtp, &dld->dtld_dependencies,
lib)) != 0) {
xyerror(D_PRAGMA_DEPEND,
- "failed to add dependency %s:%s\n",
- lib,
+ "failed to add dependency %s:%s\n", lib,
dtrace_errmsg(dtp, dtrace_errno(dtp)));
}
+ } else {
+ /*
+ * By this point we have already performed a topological
+ * sort of the dependencies; we process this directive
+ * as satisfied as long as the dependency was properly
+ * loaded.
+ */
+ if (dtp->dt_filetag == NULL)
+ xyerror(D_PRAGMA_DEPEND, "main program may "
+ "not explicitly depend on a library");
+
+ dld = dt_lib_depend_lookup(&dtp->dt_lib_dep,
+ dtp->dt_filetag);
+ assert(dld != NULL);
+
+ (void) snprintf(lib, sizeof (lib), "%s%s",
+ dld->dtld_libpath, nnp->dn_string);
+ dld = dt_lib_depend_lookup(&dtp->dt_lib_dep_sorted,
+ lib);
+ assert(dld != NULL);
+
+ if (!dld->dtld_loaded)
+ xyerror(D_PRAGMA_DEPEND, "program requires "
+ "library \"%s\" which failed to load",
+ lib);
}
- found = 1;
+
+ found = B_TRUE;
} else {
xyerror(D_PRAGMA_INVAL, "invalid class %s "
"specified by #pragma %s\n", cnp->dn_string, prname);
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#3 (text) ====
@@ -3886,15 +3886,15 @@
break;
}
- if (nargs <= 2)
- remaining = (int64_t)size;
-
if (!DTRACE_INSCRATCH(mstate, size)) {
DTRACE_CPUFLAG_SET(CPU_DTRACE_NOSCRATCH);
regs[rd] = 0;
break;
}
+ if (nargs <= 2)
+ remaining = (int64_t)size;
+
if (index < 0) {
index += len;
@@ -3904,18 +3904,20 @@
}
}
- if (index >= len || index < 0)
- index = len;
+ if (index >= len || index < 0) {
+ remaining = 0;
+ } else if (remaining < 0) {
+ remaining += len - index;
+ } else if (index + remaining > size) {
+ remaining = size - index;
+ }
- for (d[0] = '\0'; remaining > 0; remaining--) {
- if ((d[i++] = dtrace_load8(s++ + index)) == '\0')
+ for (i = 0; i < remaining; i++) {
+ if ((d[i] = dtrace_load8(s + index + i)) == '\0')
break;
+ }
- if (i == size) {
- d[i - 1] = '\0';
- break;
- }
- }
+ d[i] = '\0';
mstate->dtms_scratch_ptr += size;
regs[rd] = (uintptr_t)d;
@@ -3986,9 +3988,9 @@
* explained to them, and who can't even concisely describe
* the conditions under which one would be forced to resort to
* this technique. Needless to say, those conditions are
- * found here -- and probably only here. Is this is the only
- * use of this infamous trick in shipping, production code?
- * If it isn't, it probably should be...
+ * found here -- and probably only here. Is this the only use
+ * of this infamous trick in shipping, production code? If it
+ * isn't, it probably should be...
*/
if (minor != -1) {
uintptr_t maddr = dtrace_loadptr(daddr +
@@ -11408,33 +11410,6 @@
mutex_exit(&cpu_lock);
}
-static int
-dtrace_enabling_matchstate(dtrace_state_t *state, int *nmatched)
-{
- dtrace_enabling_t *enab;
- int matched, total = 0, err;
-
- ASSERT(MUTEX_HELD(&cpu_lock));
- ASSERT(MUTEX_HELD(&dtrace_lock));
-
- for (enab = dtrace_retained; enab != NULL; enab = enab->dten_next) {
- ASSERT(enab->dten_vstate->dtvs_state != NULL);
-
- if (enab->dten_vstate->dtvs_state != state)
- continue;
-
- if ((err = dtrace_enabling_match(enab, &matched)) != 0)
- return (err);
-
- total += matched;
- }
-
- if (nmatched != NULL)
- *nmatched = total;
-
- return (0);
-}
-
/*
* If an enabling is to be enabled without having matched probes (that is, if
* dtrace_state_go() is to be called on the underlying dtrace_state_t), the
@@ -15649,13 +15624,9 @@
* cue to reevaluate our enablings.
*/
if (arg == NULL) {
- mutex_enter(&cpu_lock);
- mutex_enter(&dtrace_lock);
- err = dtrace_enabling_matchstate(state, rv);
- mutex_exit(&dtrace_lock);
- mutex_exit(&cpu_lock);
+ dtrace_enabling_matchall();
- return (err);
+ return (0);
}
if ((dof = dtrace_dof_copyin(arg, &rval)) == NULL)
==== //depot/projects/dtrace/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#2 (text) ====
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -390,7 +390,7 @@
/*
* This is called from cfork() via dtrace_fasttrap_fork(). The child
- * process's address space is a (roughly) a copy of the parent process's so
+ * process's address space is (roughly) a copy of the parent process's so
* we have to remove all the instrumentation we had previously enabled in the
* parent.
*/
@@ -437,6 +437,15 @@
tp->ftt_proc->ftpc_acount != 0) {
int ret = fasttrap_tracepoint_remove(cp, tp);
ASSERT(ret == 0);
+
+ /*
+ * The count of active providers can only be
+ * decremented (i.e. to zero) during exec,
+ * exit, and removal of a meta provider so it
+ * should be impossible to drop the count
+ * mid-fork.
+ */
+ ASSERT(tp->ftt_proc->ftpc_acount != 0);
}
}
mutex_exit(&bucket->ftb_mtx);
@@ -517,6 +526,12 @@
again:
mutex_enter(&bucket->ftb_mtx);
for (tp = bucket->ftb_data; tp != NULL; tp = tp->ftt_next) {
+ /*
+ * Note that it's safe to access the active count on the
+ * associated proc structure because we know that at least one
+ * provider (this one) will still be around throughout this
+ * operation.
+ */
if (tp->ftt_pid != pid || tp->ftt_pc != pc ||
tp->ftt_proc->ftpc_acount == 0)
continue;
@@ -1157,6 +1172,7 @@
mutex_exit(&bucket->ftb_mtx);
fprc->ftpc_rcount++;
atomic_add_64(&fprc->ftpc_acount, 1);
+ ASSERT(fprc->ftpc_acount <= fprc->ftpc_rcount);
mutex_exit(&fprc->ftpc_mtx);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 05:52:06 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9EAF21065673; Tue, 22 Apr 2008 05:52:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 5FD681065672
for <perforce@freebsd.org>; Tue, 22 Apr 2008 05:52:06 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 5159D8FC1D
for <perforce@freebsd.org>; Tue, 22 Apr 2008 05:52:06 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3M5q6Ew096741
for <perforce@freebsd.org>; Tue, 22 Apr 2008 05:52:06 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M5q6WY096739
for perforce@freebsd.org; Tue, 22 Apr 2008 05:52:06 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 05:52:06 GMT
Message-Id: <200804220552.m3M5q6WY096739@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140384 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 05:52:06 -0000
http://perforce.freebsd.org/chv.cgi?CH=140384
Change 140384 by jb@freebsd3 on 2008/04/22 05:51:27
Update the BSD ioctl function to suit the IFopensolaris.
It's a shame that BSD and SYSV ioctl designs differ so much that we have
to have a separate code base. Sigh.
Affected files ...
.. //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#22 edit
Differences ...
==== //depot/projects/dtrace/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#22 (text+ko) ====
@@ -342,13 +342,9 @@
* cue to reevaluate our enablings.
*/
if (p->dof == NULL) {
- mutex_enter(&cpu_lock);
- mutex_enter(&dtrace_lock);
- err = dtrace_enabling_matchstate(state, &p->n_matched);
- mutex_exit(&dtrace_lock);
- mutex_exit(&cpu_lock);
+ dtrace_enabling_matchall();
- return (err);
+ return (0);
}
if ((dof = dtrace_dof_copyin((uintptr_t) p->dof, &rval)) == NULL)
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 07:04:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5EA01106566B; Tue, 22 Apr 2008 07:04:30 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1CBEB106566C
for <perforce@freebsd.org>; Tue, 22 Apr 2008 07:04:30 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 08D7B8FC12
for <perforce@freebsd.org>; Tue, 22 Apr 2008 07:04:30 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3M74TuU003633
for <perforce@freebsd.org>; Tue, 22 Apr 2008 07:04:29 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M74Sgk003631
for perforce@freebsd.org; Tue, 22 Apr 2008 07:04:28 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 07:04:28 GMT
Message-Id: <200804220704.m3M74Sgk003631@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140387 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 07:04:30 -0000
http://perforce.freebsd.org/chv.cgi?CH=140387
Change 140387 by jb@freebsd3 on 2008/04/22 07:03:31
IFdtrace.
A bucket load of merge conflicts here cased by moving the #%$@ CDDL files.
Affected files ...
.. //depot/projects/dtrace7/src/Makefile.inc1#6 integrate
.. //depot/projects/dtrace7/src/cddl/Makefile.inc#5 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/dtrace.h#1 branch
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/fsshare.h#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/libintl.h#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/libproc.h#1 branch
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/zone.h#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/deviceid.c#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/fsshare.c#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mkdirp.c#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mnttab.c#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/zmount.c#2 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/zone.c#2 integrate
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#2 integrate
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/amd64/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/i386/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparc/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparcv9/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.exe#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_DEPEND.main.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libchain.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#1 branch
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#1 branch
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 08:16:51 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C2F711065672; Tue, 22 Apr 2008 08:16:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 85095106564A
for <perforce@freebsd.org>; Tue, 22 Apr 2008 08:16:51 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 6F1FF8FC17
for <perforce@freebsd.org>; Tue, 22 Apr 2008 08:16:51 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3M8GpI3007779
for <perforce@freebsd.org>; Tue, 22 Apr 2008 08:16:51 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M8Gpkp007777
for perforce@freebsd.org; Tue, 22 Apr 2008 08:16:51 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 08:16:51 GMT
Message-Id: <200804220816.m3M8Gpkp007777@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140391 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 08:16:52 -0000
http://perforce.freebsd.org/chv.cgi?CH=140391
Change 140391 by jb@freebsd3 on 2008/04/22 08:16:45
IFC
FreeBSD ID loopback
Affected files ...
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_rtld.c#6 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/acl.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/bitmap.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/callb.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpupart.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#3 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dkio.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/objfs.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 integrate
Differences ...
==== //depot/projects/dtrace/src/lib/libthr/thread/thr_rtld.c#6 (text) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.7 2008/04/02 07:41:24 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.8 2008/04/22 06:44:11 davidxu Exp $
*
*/
@@ -40,8 +40,6 @@
extern int errno;
#define CACHE_LINE_SIZE 64
-#define WAFLAG 0x1
-#define RC_INCR 0x2
static int _thr_rtld_clr_flag(int);
static void *_thr_rtld_lock_create(void);
@@ -52,11 +50,7 @@
static void _thr_rtld_wlock_acquire(void *);
struct rtld_lock {
- volatile int lock;
- volatile int rd_waiters;
- volatile int wr_waiters;
- volatile long rd_cv;
- volatile long wr_cv;
+ struct urwlock lock;
void *base;
};
@@ -67,19 +61,22 @@
char *p;
uintptr_t r;
struct rtld_lock *l;
+ size_t size;
- THR_ASSERT(sizeof(struct rtld_lock) <= CACHE_LINE_SIZE,
- "rtld_lock too large");
- base = calloc(1, CACHE_LINE_SIZE);
+ size = CACHE_LINE_SIZE;
+ while (size < sizeof(struct rtld_lock))
+ size <<= 1;
+ base = calloc(1, size);
p = (char *)base;
if ((uintptr_t)p % CACHE_LINE_SIZE != 0) {
free(base);
- base = calloc(1, 2 * CACHE_LINE_SIZE);
+ base = calloc(1, size + CACHE_LINE_SIZE);
p = (char *)base;
if ((r = (uintptr_t)p % CACHE_LINE_SIZE) != 0)
p += CACHE_LINE_SIZE - r;
}
l = (struct rtld_lock *)p;
+ l->lock.rw_flags = URWLOCK_PREFER_READER;
l->base = base;
return (l);
}
@@ -110,7 +107,6 @@
{
struct pthread *curthread;
struct rtld_lock *l;
- long v;
int errsave;
curthread = _get_curthread();
@@ -118,18 +114,8 @@
l = (struct rtld_lock *)lock;
THR_CRITICAL_ENTER(curthread);
- atomic_add_acq_int(&l->lock, RC_INCR);
- if (!(l->lock & WAFLAG)) {
- RESTORE_ERRNO();
- return;
- }
- v = l->rd_cv;
- atomic_add_int(&l->rd_waiters, 1);
- while (l->lock & WAFLAG) {
- _thr_umtx_wait(&l->rd_cv, v, NULL);
- v = l->rd_cv;
- }
- atomic_add_int(&l->rd_waiters, -1);
+ while (_thr_rwlock_rdlock(&l->lock, 0, NULL) != 0)
+ ;
RESTORE_ERRNO();
}
@@ -138,7 +124,6 @@
{
struct pthread *curthread;
struct rtld_lock *l;
- long v;
int errsave;
curthread = _get_curthread();
@@ -146,19 +131,9 @@
l = (struct rtld_lock *)lock;
_thr_signal_block(curthread);
- for (;;) {
- if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) {
- RESTORE_ERRNO();
- return;
- }
- v = l->wr_cv;
- atomic_add_int(&l->wr_waiters, 1);
- while (l->lock != 0) {
- _thr_umtx_wait(&l->wr_cv, v, NULL);
- v = l->wr_cv;
- }
- atomic_add_int(&l->wr_waiters, -1);
- }
+ while (_thr_rwlock_wrlock(&l->lock, NULL) != 0)
+ ;
+ RESTORE_ERRNO();
}
static void
@@ -166,29 +141,20 @@
{
struct pthread *curthread;
struct rtld_lock *l;
+ int32_t state;
int errsave;
curthread = _get_curthread();
SAVE_ERRNO();
l = (struct rtld_lock *)lock;
- if ((l->lock & WAFLAG) == 0) {
- atomic_add_rel_int(&l->lock, -RC_INCR);
- if (l->lock == 0 && l->wr_waiters) {
- atomic_add_long(&l->wr_cv, 1);
- _thr_umtx_wake(&l->wr_cv, l->wr_waiters);
+ state = l->lock.rw_state;
+ if (_thr_rwlock_unlock(&l->lock) == 0) {
+ if ((state & URWLOCK_WRITE_OWNER) == 0) {
+ THR_CRITICAL_LEAVE(curthread);
+ } else {
+ _thr_signal_unblock(curthread);
}
- THR_CRITICAL_LEAVE(curthread);
- } else {
- atomic_add_rel_int(&l->lock, -WAFLAG);
- if (l->lock == 0 && l->wr_waiters) {
- atomic_add_long(&l->wr_cv, 1);
- _thr_umtx_wake(&l->wr_cv, l->wr_waiters);
- } else if (l->rd_waiters) {
- atomic_add_long(&l->rd_cv, 1);
- _thr_umtx_wake(&l->rd_cv, l->rd_waiters);
- }
- _thr_signal_unblock(curthread);
}
RESTORE_ERRNO();
}
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c,v 1.4 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/acl.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/acl.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/bitmap.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/bitmap.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/byteorder.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/byteorder.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/callb.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/callb.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpupart.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpupart.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#3 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/dkio.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dkio.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/mntent.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mntent.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/objfs.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/objfs.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
#ifndef _COMPAT_OPENSOLARIS_SYS_OBJFS_H
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq_impl.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 08:43:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3BC371065675; Tue, 22 Apr 2008 08:43:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id F17C6106566C
for <perforce@freebsd.org>; Tue, 22 Apr 2008 08:43:20 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id DAA078FC13
for <perforce@freebsd.org>; Tue, 22 Apr 2008 08:43:20 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3M8hKJT009612
for <perforce@freebsd.org>; Tue, 22 Apr 2008 08:43:20 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M8hKaV009610
for perforce@freebsd.org; Tue, 22 Apr 2008 08:43:20 GMT
(envelope-from gabor@freebsd.org)
Date: Tue, 22 Apr 2008 08:43:20 GMT
Message-Id: <200804220843.m3M8hKaV009610@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140394 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 08:43:21 -0000
http://perforce.freebsd.org/chv.cgi?CH=140394
Change 140394 by gabor@gabor_server on 2008/04/22 08:42:51
Add my initial version of the grep, sort and diff for my
Summer of Code 2008 project. These version are in sync with
the versions of OpenBSD and furthermore contain small
additions:
- Added support for long command line options to sort
- Man page completion for all of the three utilities
- Comments about missing / incomplete features
Obtained from: OpenBSD
Affected files ...
.. //depot/projects/soc2008/gabor_textproc/diff/Makefile#1 add
.. //depot/projects/soc2008/gabor_textproc/diff/diff.1#1 add
.. //depot/projects/soc2008/gabor_textproc/diff/diff.c#1 add
.. //depot/projects/soc2008/gabor_textproc/diff/diff.h#1 add
.. //depot/projects/soc2008/gabor_textproc/diff/diffdir.c#1 add
.. //depot/projects/soc2008/gabor_textproc/diff/diffreg.c#1 add
.. //depot/projects/soc2008/gabor_textproc/diff/pathnames.h#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/Makefile#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/binary.c#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/file.c#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/foobar.gz#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/grep.1#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/grep.c#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/grep.core#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/grep.h#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/mmfile.c#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/queue.c#1 add
.. //depot/projects/soc2008/gabor_textproc/grep/util.c#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/Makefile#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/append.c#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/extern.h#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/fields.c#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/files.c#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/fsort.c#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/fsort.h#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/init.c#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/msort.c#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/pathnames.h#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/sort.1#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/sort.c#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/sort.h#1 add
.. //depot/projects/soc2008/gabor_textproc/sort/tmp.c#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 09:53:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 8F4911065706; Tue, 22 Apr 2008 09:53:36 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 50BD71065702
for <perforce@freebsd.org>; Tue, 22 Apr 2008 09:53:36 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 346898FC2B
for <perforce@freebsd.org>; Tue, 22 Apr 2008 09:53:36 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3M9raLa023025
for <perforce@freebsd.org>; Tue, 22 Apr 2008 09:53:36 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3M9ran7023023
for perforce@freebsd.org; Tue, 22 Apr 2008 09:53:36 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 09:53:36 GMT
Message-Id: <200804220953.m3M9ran7023023@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140397 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 09:53:36 -0000
http://perforce.freebsd.org/chv.cgi?CH=140397
Change 140397 by jb@freebsd3 on 2008/04/22 09:52:57
IF7
Affected files ...
.. //depot/projects/dtrace7/src/lib/libc/stdlib/strfmon.c#2 integrate
.. //depot/projects/dtrace7/src/lib/libthr/thread/thr_mutexattr.c#2 integrate
.. //depot/projects/dtrace7/src/share/man/man4/nfe.4#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/ip1000phy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/ip1000phyreg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/miidevs#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/re/if_re.c#6 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_rl.c#5 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_rlreg.h#4 integrate
Differences ...
==== //depot/projects/dtrace7/src/lib/libc/stdlib/strfmon.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15 2005/09/12 19:52:42 stefanf Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.15.2.1 2008/04/22 08:05:38 ru Exp $");
#include <sys/types.h>
#include <ctype.h>
@@ -67,6 +67,8 @@
while (isdigit((unsigned char)*fmt)) { \
VAR *= 10; \
VAR += *fmt - '0'; \
+ if (VAR < 0) \
+ goto e2big_error; \
fmt++; \
} \
} while (0)
@@ -187,7 +189,7 @@
/* Do we have enough space to put number with
* required width ?
*/
- if (dst + width >= s + maxsize)
+ if ((unsigned int)width >= maxsize - (dst - s))
goto e2big_error;
}
@@ -196,6 +198,8 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(left_prec);
+ if ((unsigned int)left_prec >= maxsize - (dst - s))
+ goto e2big_error;
}
/* Right precision */
@@ -203,6 +207,9 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(right_prec);
+ if ((unsigned int)right_prec >= maxsize - (dst - s) -
+ left_prec)
+ goto e2big_error;
}
/* Conversion Characters */
@@ -218,6 +225,8 @@
goto format_error;
}
+ if (currency_symbol != NULL)
+ free(currency_symbol);
if (flags & USE_INTL_CURRENCY) {
currency_symbol = strdup(lc->int_curr_symbol);
if (currency_symbol != NULL)
@@ -246,6 +255,8 @@
pad_size = 0;
}
+ if (asciivalue != NULL)
+ free(asciivalue);
asciivalue = __format_grouped_double(value, &flags,
left_prec, right_prec, pad_char);
if (asciivalue == NULL)
@@ -535,12 +546,11 @@
/* make sure that we've enough space for result string */
bufsize = strlen(avalue)*2+1;
- rslt = malloc(bufsize);
+ rslt = calloc(1, bufsize);
if (rslt == NULL) {
free(avalue);
return (NULL);
}
- memset(rslt, 0, bufsize);
bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */
/* skip spaces at beggining */
==== //depot/projects/dtrace7/src/lib/libthr/thread/thr_mutexattr.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_mutexattr.c,v 1.7 2007/01/12 07:26:20 imp Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_mutexattr.c,v 1.7.2.1 2008/04/22 01:28:15 davidxu Exp $
*/
/*
@@ -132,8 +132,7 @@
{
int ret;
if (attr == NULL || *attr == NULL || type >= PTHREAD_MUTEX_TYPE_MAX) {
- errno = EINVAL;
- ret = -1;
+ ret = EINVAL;
} else {
(*attr)->m_type = type;
ret = 0;
==== //depot/projects/dtrace7/src/share/man/man4/nfe.4#3 (text+ko) ====
@@ -14,9 +14,9 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: src/share/man/man4/nfe.4,v 1.8.2.1 2007/12/02 08:45:57 remko Exp $
+.\" $FreeBSD: src/share/man/man4/nfe.4,v 1.8.2.2 2008/04/22 06:19:29 yongari Exp $
.\"
-.Dd Nov 27, 2007
+.Dd April 16, 2008
.Dt NFE 4
.Os
.Sh NAME
@@ -43,7 +43,7 @@
driver supports PCI Ethernet adapters based on the NVIDIA
nForce Media and Communications Processors (MCP), such as
the nForce, nForce 2, nForce 3, CK804, MCP04, MCP51, MCP55,
-MCP61, MCP65 and MCP67 Ethernet controller chips.
+MCP61, MCP65, MCP67 and MCP73 Ethernet controller chips.
.Pp
Supported features include (hardware support provided):
.Pp
@@ -116,6 +116,8 @@
.It
NVIDIA nForce MCP67 Networking Adapter
.It
+NVIDIA nForce MCP73 Networking Adapter
+.It
NVIDIA nForce2 MCP2 Networking Adapter
.It
NVIDIA nForce2 400 MCP4 Networking Adapter
==== //depot/projects/dtrace7/src/sys/dev/mii/ip1000phy.c#2 (text+ko) ====
@@ -27,10 +27,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/ip1000phy.c,v 1.2 2006/12/02 15:32:33 marius Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/ip1000phy.c,v 1.2.2.1 2008/04/22 06:35:37 yongari Exp $");
/*
- * Driver for the IC Plus IP1000A 10/100/1000 PHY.
+ * Driver for the IC Plus IP1000A/IP1001 10/100/1000 PHY.
*/
#include <sys/param.h>
@@ -57,6 +57,12 @@
static int ip1000phy_probe(device_t);
static int ip1000phy_attach(device_t);
+struct ip1000phy_softc {
+ struct mii_softc mii_sc;
+ int model;
+ int revision;
+};
+
static device_method_t ip1000phy_methods[] = {
/* device interface */
DEVMETHOD(device_probe, ip1000phy_probe),
@@ -82,6 +88,7 @@
static const struct mii_phydesc ip1000phys[] = {
MII_PHY_DESC(ICPLUS, IP1000A),
+ MII_PHY_DESC(ICPLUS, IP1001),
MII_PHY_END
};
@@ -95,11 +102,13 @@
static int
ip1000phy_attach(device_t dev)
{
+ struct ip1000phy_softc *isc;
struct mii_softc *sc;
struct mii_attach_args *ma;
struct mii_data *mii;
- sc = device_get_softc(dev);
+ isc = device_get_softc(dev);
+ sc = &isc->mii_sc;
ma = device_get_ivars(dev);
sc->mii_dev = device_get_parent(dev);
mii = device_get_softc(sc->mii_dev);
@@ -114,6 +123,9 @@
mii->mii_instance++;
+ isc->model = MII_MODEL(ma->mii_id2);
+ isc->revision = MII_REV(ma->mii_id2);
+
device_printf(dev, " ");
#define ADD(m, c) ifmedia_add(&mii->mii_media, (m), (c), NULL)
@@ -302,10 +314,13 @@
static void
ip1000phy_status(struct mii_softc *sc)
{
+ struct ip1000phy_softc *isc;
struct mii_data *mii = sc->mii_pdata;
uint32_t bmsr, bmcr, stat;
uint32_t ar, lpar;
+ isc = (struct ip1000phy_softc *)sc;
+
mii->mii_media_status = IFM_AVALID;
mii->mii_media_active = IFM_ETHER;
@@ -326,25 +341,44 @@
}
}
- stat = PHY_READ(sc, STGE_PhyCtrl);
- switch (PC_LinkSpeed(stat)) {
- case PC_LinkSpeed_Down:
- mii->mii_media_active |= IFM_NONE;
- return;
- case PC_LinkSpeed_10:
- mii->mii_media_active |= IFM_10_T;
- break;
- case PC_LinkSpeed_100:
- mii->mii_media_active |= IFM_100_TX;
- break;
- case PC_LinkSpeed_1000:
- mii->mii_media_active |= IFM_1000_T;
- break;
+ if (isc->model == MII_MODEL_ICPLUS_IP1001) {
+ stat = PHY_READ(sc, IP1000PHY_LSR);
+ switch (stat & IP1000PHY_LSR_SPEED_MASK) {
+ case IP1000PHY_LSR_SPEED_10:
+ mii->mii_media_active |= IFM_10_T;
+ break;
+ case IP1000PHY_LSR_SPEED_100:
+ mii->mii_media_active |= IFM_100_TX;
+ break;
+ case IP1000PHY_LSR_SPEED_1000:
+ mii->mii_media_active |= IFM_1000_T;
+ break;
+ }
+ if ((stat & IP1000PHY_LSR_FULL_DUPLEX) != 0)
+ mii->mii_media_active |= IFM_FDX;
+ else
+ mii->mii_media_active |= IFM_HDX;
+ } else {
+ stat = PHY_READ(sc, STGE_PhyCtrl);
+ switch (PC_LinkSpeed(stat)) {
+ case PC_LinkSpeed_Down:
+ mii->mii_media_active |= IFM_NONE;
+ return;
+ case PC_LinkSpeed_10:
+ mii->mii_media_active |= IFM_10_T;
+ break;
+ case PC_LinkSpeed_100:
+ mii->mii_media_active |= IFM_100_TX;
+ break;
+ case PC_LinkSpeed_1000:
+ mii->mii_media_active |= IFM_1000_T;
+ break;
+ }
+ if ((stat & PC_PhyDuplexStatus) != 0)
+ mii->mii_media_active |= IFM_FDX;
+ else
+ mii->mii_media_active |= IFM_HDX;
}
- if ((stat & PC_PhyDuplexStatus) != 0)
- mii->mii_media_active |= IFM_FDX;
- else
- mii->mii_media_active |= IFM_HDX;
ar = PHY_READ(sc, IP1000PHY_MII_ANAR);
lpar = PHY_READ(sc, IP1000PHY_MII_ANLPAR);
@@ -410,10 +444,12 @@
static void
ip1000phy_reset(struct mii_softc *sc)
{
+ struct ip1000phy_softc *isc;
struct stge_softc *stge_sc;
struct mii_data *mii;
uint32_t reg;
+ isc = (struct ip1000phy_softc *)sc;
mii_phy_reset(sc);
/* clear autoneg/full-duplex as we don't want it after reset */
@@ -426,7 +462,8 @@
* XXX There should be more general way to pass PHY specific
* data via mii interface.
*/
- if (strcmp(mii->mii_ifp->if_dname, "stge") == 0) {
+ if (isc->model == MII_MODEL_ICPLUS_IP1000A &&
+ strcmp(mii->mii_ifp->if_dname, "stge") == 0) {
stge_sc = mii->mii_ifp->if_softc;
if (stge_sc->sc_rev >= 0x40 && stge_sc->sc_rev <= 0x4e)
ip1000phy_load_dspcode(sc);
==== //depot/projects/dtrace7/src/sys/dev/mii/ip1000phyreg.h#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/sys/dev/mii/ip1000phyreg.h,v 1.1 2006/07/25 00:16:09 yongari Exp $
+ * $FreeBSD: src/sys/dev/mii/ip1000phyreg.h,v 1.1.4.1 2008/04/22 06:35:37 yongari Exp $
*/
#ifndef _DEV_MII_IP1000PHYREG_H_
@@ -138,4 +138,49 @@
#define IP1000PHY_EXTSTS_1000X 0x4000
#define IP1000PHY_EXTSTS_1000X_FDX 0x8000
+/* PHY specific control & status register. IP1001 only. */
+#define IP1000PHY_SCSR 0x10
+#define IP1000PHY_SCSR_RXPHASE_SEL 0x0001
+#define IP1000PHY_SCSR_TXPHASE_SEL 0x0002
+#define IP1000PHY_SCSR_REPEATOR_MODE 0x0004
+#define IP1000PHY_SCSR_RESERVED1_DEF 0x0008
+#define IP1000PHY_SCSR_RXCLK_DRV_MASK 0x0060
+#define IP1000PHY_SCSR_RXCLK_DRV_DEF 0x0040
+#define IP1000PHY_SCSR_RXD_DRV_MASK 0x0180
+#define IP1000PHY_SCSR_RXD_DRV_DEF 0x0100
+#define IP1000PHY_SCSR_JABBER_ENB 0x0200
+#define IP1000PHY_SCSR_HEART_BEAT_ENB 0x0400
+#define IP1000PHY_SCSR_DOWNSHIFT_ENB 0x0800
+#define IP1000PHY_SCSR_RESERVED2_DEF 0x1000
+#define IP1000PHY_SCSR_LED_DRV_4MA 0x0000
+#define IP1000PHY_SCSR_LED_DRV_8MA 0x2000
+#define IP1000PHY_SCSR_LED_MODE_MASK 0xC000
+#define IP1000PHY_SCSR_LED_MODE_DEF 0x0000
+
+/* PHY link status register. IP1001 only. */
+#define IP1000PHY_LSR 0x11
+#define IP1000PHY_LSR_JABBER_DET 0x0200
+#define IP1000PHY_LSR_APS_SLEEP 0x0400
+#define IP1000PHY_LSR_MDIX 0x0800
+#define IP1000PHY_LSR_FULL_DUPLEX 0x1000
+#define IP1000PHY_LSR_SPEED_10 0x0000
+#define IP1000PHY_LSR_SPEED_100 0x2000
+#define IP1000PHY_LSR_SPEED_1000 0x4000
+#define IP1000PHY_LSR_SPEED_MASK 0x6000
+#define IP1000PHY_LSR_LINKUP 0x8000
+
+/* PHY specific control register 2. IP1001 only. */
+#define IP1000PHY_SCR
+#define IP1000PHY_SCR_SEW_RATE_MASK 0x0003
+#define IP1000PHY_SCR_SEW_RATE_DEF 0x0003
+#define IP1000PHY_SCR_AUTO_XOVER 0x0004
+#define IP1000PHY_SCR_SPEED_10_100_ENB 0x0040
+#define IP1000PHY_SCR_FIFO_LATENCY_2 0x0000
+#define IP1000PHY_SCR_FIFO_LATENCY_3 0x0080
+#define IP1000PHY_SCR_FIFO_LATENCY_4 0x0100
+#define IP1000PHY_SCR_FIFO_LATENCY_5 0x0180
+#define IP1000PHY_SCR_MDIX_ENB 0x0200
+#define IP1000PHY_SCR_RESERVED_DEF 0x0400
+#define IP1000PHY_SCR_APS_ON 0x0800
+
#endif /* _DEV_MII_IP1000PHYREG_H_ */
==== //depot/projects/dtrace7/src/sys/dev/mii/miidevs#3 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/sys/dev/mii/miidevs,v 1.46.2.3 2008/03/17 18:23:44 jhb Exp $
+$FreeBSD: src/sys/dev/mii/miidevs,v 1.46.2.4 2008/04/22 06:35:37 yongari Exp $
/*$NetBSD: miidevs,v 1.6 1999/05/14 11:37:30 drochner Exp $*/
/*-
@@ -156,6 +156,7 @@
/* IC Plus Corp. PHYs */
model ICPLUS IP101 0x0005 IC Plus 10/100 PHY
model ICPLUS IP1000A 0x0008 IC Plus 10/100/1000 media interface
+model ICPLUS IP1001 0x0019 IC Plus IP1001 10/100/1000 media interface
/* Intel PHYs */
model xxINTEL I82553AB 0x0000 i83553 10/100 media interface
==== //depot/projects/dtrace7/src/sys/dev/mii/rgephy.c#2 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.15.2.2 2007/11/05 01:39:25 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/mii/rgephy.c,v 1.15.2.3 2008/04/22 06:25:11 yongari Exp $");
/*
* Driver for the RealTek 8169S/8110S/8211B internal 10/100/1000 PHY.
@@ -367,6 +367,11 @@
bmsr = PHY_READ(sc, RGEPHY_MII_BMSR);
bmcr = PHY_READ(sc, RGEPHY_MII_BMCR);
+ if (bmcr & RGEPHY_BMCR_ISO) {
+ mii->mii_media_active |= IFM_NONE;
+ mii->mii_media_status = 0;
+ return;
+ }
if (bmcr & RGEPHY_BMCR_LOOP)
mii->mii_media_active |= IFM_LOOP;
==== //depot/projects/dtrace7/src/sys/dev/re/if_re.c#6 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.95.2.5 2008/03/13 07:50:47 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/re/if_re.c,v 1.95.2.18 2008/04/22 06:14:56 yongari Exp $");
/*
* RealTek 8139C+/8169/8169S/8110S/8168/8111/8101E PCI NIC driver
@@ -146,6 +146,8 @@
#include <dev/pci/pcireg.h>
#include <dev/pci/pcivar.h>
+#include <pci/if_rlreg.h>
+
MODULE_DEPEND(re, pci, 1, 1, 1);
MODULE_DEPEND(re, ether, 1, 1, 1);
MODULE_DEPEND(re, miibus, 1, 1, 1);
@@ -158,10 +160,8 @@
*/
#define RE_USEIOSPACE
-#include <pci/if_rlreg.h>
-
/* Tunables. */
-static int msi_disable = 0;
+static int msi_disable = 1;
TUNABLE_INT("hw.re.msi_disable", &msi_disable);
#define RE_CSUM_FEATURES (CSUM_IP | CSUM_TCP | CSUM_UDP)
@@ -201,8 +201,7 @@
{ LINKSYS_VENDORID, LINKSYS_DEVICEID_EG1032, RL_HWREV_8169S,
"Linksys EG1032 (RTL8169S) Gigabit Ethernet" },
{ USR_VENDORID, USR_DEVICEID_997902, RL_HWREV_8169S,
- "US Robotics 997902 (RTL8169S) Gigabit Ethernet" },
- { 0, 0, 0, NULL }
+ "US Robotics 997902 (RTL8169S) Gigabit Ethernet" }
};
static struct rl_hwrev re_hwrevs[] = {
@@ -233,13 +232,13 @@
static int re_attach (device_t);
static int re_detach (device_t);
-static int re_encap (struct rl_softc *, struct mbuf **, int *);
+static int re_encap (struct rl_softc *, struct mbuf **);
static void re_dma_map_addr (void *, bus_dma_segment_t *, int, int);
-static void re_dma_map_desc (void *, bus_dma_segment_t *, int,
- bus_size_t, int);
static int re_allocmem (device_t, struct rl_softc *);
-static int re_newbuf (struct rl_softc *, int, struct mbuf *);
+static __inline void re_discard_rxbuf
+ (struct rl_softc *, int);
+static int re_newbuf (struct rl_softc *, int);
static int re_rx_list_init (struct rl_softc *);
static int re_tx_list_init (struct rl_softc *);
#ifdef RE_FIXUP_RX
@@ -280,6 +279,8 @@
static void re_setmulti (struct rl_softc *);
static void re_reset (struct rl_softc *);
+static void re_setwol (struct rl_softc *);
+static void re_clrwol (struct rl_softc *);
#ifdef RE_DIAG
static int re_diag (struct rl_softc *);
@@ -849,14 +850,14 @@
bus_dmamap_sync(sc->rl_ldata.rl_rx_list_tag,
sc->rl_ldata.rl_rx_list_map,
BUS_DMASYNC_POSTREAD);
- bus_dmamap_sync(sc->rl_ldata.rl_mtag,
- sc->rl_ldata.rl_rx_dmamap[0],
- BUS_DMASYNC_POSTWRITE);
- bus_dmamap_unload(sc->rl_ldata.rl_mtag,
- sc->rl_ldata.rl_rx_dmamap[0]);
+ bus_dmamap_sync(sc->rl_ldata.rl_rx_mtag,
+ sc->rl_ldata.rl_rx_desc[0].rx_dmamap,
+ BUS_DMASYNC_POSTREAD);
+ bus_dmamap_unload(sc->rl_ldata.rl_rx_mtag,
+ sc->rl_ldata.rl_rx_desc[0].rx_dmamap);
- m0 = sc->rl_ldata.rl_rx_mbuf[0];
- sc->rl_ldata.rl_rx_mbuf[0] = NULL;
+ m0 = sc->rl_ldata.rl_rx_desc[0].rx_m;
+ sc->rl_ldata.rl_rx_desc[0].rx_m = NULL;
eh = mtod(m0, struct ether_header *);
cur_rx = &sc->rl_ldata.rl_rx_list[0];
@@ -916,133 +917,41 @@
device_t dev;
{
struct rl_type *t;
- struct rl_softc *sc;
- int rid;
- u_int32_t hwrev;
+ uint16_t devid, vendor;
+ uint16_t revid, sdevid;
+ int i;
+
+ vendor = pci_get_vendor(dev);
+ devid = pci_get_device(dev);
+ revid = pci_get_revid(dev);
+ sdevid = pci_get_subdevice(dev);
- t = re_devs;
- sc = device_get_softc(dev);
-
- while (t->rl_name != NULL) {
- if ((pci_get_vendor(dev) == t->rl_vid) &&
- (pci_get_device(dev) == t->rl_did)) {
+ if (vendor == LINKSYS_VENDORID && devid == LINKSYS_DEVICEID_EG1032) {
+ if (sdevid != LINKSYS_SUBDEVICE_EG1032_REV3) {
/*
* Only attach to rev. 3 of the Linksys EG1032 adapter.
- * Rev. 2 i supported by sk(4).
+ * Rev. 2 is supported by sk(4).
*/
- if ((t->rl_vid == LINKSYS_VENDORID) &&
- (t->rl_did == LINKSYS_DEVICEID_EG1032) &&
- (pci_get_subdevice(dev) !=
- LINKSYS_SUBDEVICE_EG1032_REV3)) {
- t++;
- continue;
- }
-
- /*
- * Temporarily map the I/O space
- * so we can read the chip ID register.
- */
- rid = RL_RID;
- sc->rl_res = bus_alloc_resource_any(dev, RL_RES, &rid,
- RF_ACTIVE);
- if (sc->rl_res == NULL) {
- device_printf(dev,
- "couldn't map ports/memory\n");
- return (ENXIO);
- }
- sc->rl_btag = rman_get_bustag(sc->rl_res);
- sc->rl_bhandle = rman_get_bushandle(sc->rl_res);
- hwrev = CSR_READ_4(sc, RL_TXCFG) & RL_TXCFG_HWREV;
- bus_release_resource(dev, RL_RES,
- RL_RID, sc->rl_res);
- if (t->rl_basetype == hwrev) {
- device_set_desc(dev, t->rl_name);
- return (BUS_PROBE_DEFAULT);
- }
+ return (ENXIO);
}
- t++;
}
- return (ENXIO);
-}
-
-/*
- * This routine takes the segment list provided as the result of
- * a bus_dma_map_load() operation and assigns the addresses/lengths
- * to RealTek DMA descriptors. This can be called either by the RX
- * code or the TX code. In the RX case, we'll probably wind up mapping
- * at most one segment. For the TX case, there could be any number of
- * segments since TX packets may span multiple mbufs. In either case,
- * if the number of segments is larger than the rl_maxsegs limit
- * specified by the caller, we abort the mapping operation. Sadly,
- * whoever designed the buffer mapping API did not provide a way to
- * return an error from here, so we have to fake it a bit.
- */
-
-static void
-re_dma_map_desc(arg, segs, nseg, mapsize, error)
- void *arg;
- bus_dma_segment_t *segs;
- int nseg;
- bus_size_t mapsize;
- int error;
-{
- struct rl_dmaload_arg *ctx;
- struct rl_desc *d = NULL;
- int i = 0, idx;
- u_int32_t cmdstat;
- int totlen = 0;
-
- if (error)
- return;
-
- ctx = arg;
-
- /* Signal error to caller if there's too many segments */
- if (nseg > ctx->rl_maxsegs) {
- ctx->rl_maxsegs = 0;
- return;
+ if (vendor == RT_VENDORID && devid == RT_DEVICEID_8139) {
+ if (revid != 0x20) {
+ /* 8139, let rl(4) take care of this device. */
+ return (ENXIO);
+ }
}
- /*
- * Map the segment array into descriptors. Note that we set the
- * start-of-frame and end-of-frame markers for either TX or RX, but
- * they really only have meaning in the TX case. (In the RX case,
- * it's the chip that tells us where packets begin and end.)
- * We also keep track of the end of the ring and set the
- * end-of-ring bits as needed, and we set the ownership bits
- * in all except the very first descriptor. (The caller will
- * set this descriptor later when it start transmission or
- * reception.)
- */
- idx = ctx->rl_idx;
- for (;;) {
- d = &ctx->rl_ring[idx];
- if (le32toh(d->rl_cmdstat) & RL_RDESC_STAT_OWN) {
- ctx->rl_maxsegs = 0;
- return;
+ t = re_devs;
+ for (i = 0; i < sizeof(re_devs) / sizeof(re_devs[0]); i++, t++) {
+ if (vendor == t->rl_vid && devid == t->rl_did) {
+ device_set_desc(dev, t->rl_name);
+ return (BUS_PROBE_DEFAULT);
}
- cmdstat = segs[i].ds_len;
- totlen += segs[i].ds_len;
- d->rl_vlanctl = 0;
- d->rl_bufaddr_lo = htole32(RL_ADDR_LO(segs[i].ds_addr));
- d->rl_bufaddr_hi = htole32(RL_ADDR_HI(segs[i].ds_addr));
- if (i == 0)
- cmdstat |= RL_TDESC_CMD_SOF;
- else
- cmdstat |= RL_TDESC_CMD_OWN;
- if (idx == (RL_RX_DESC_CNT - 1))
- cmdstat |= RL_TDESC_CMD_EOR;
- d->rl_cmdstat = htole32(cmdstat | ctx->rl_flags);
- i++;
- if (i == nseg)
- break;
- RL_DESC_INC(idx);
}
- d->rl_cmdstat |= htole32(RL_TDESC_CMD_EOF);
- ctx->rl_maxsegs = nseg;
- ctx->rl_idx = idx;
+ return (ENXIO);
}
/*
@@ -1071,21 +980,52 @@
device_t dev;
struct rl_softc *sc;
{
+ bus_size_t rx_list_size, tx_list_size;
int error;
- int nseg;
int i;
+ rx_list_size = sc->rl_ldata.rl_rx_desc_cnt * sizeof(struct rl_desc);
+ tx_list_size = sc->rl_ldata.rl_tx_desc_cnt * sizeof(struct rl_desc);
+
+ /*
+ * Allocate the parent bus DMA tag appropriate for PCI.
+ * In order to use DAC, RL_CPLUSCMD_PCI_DAC bit of RL_CPLUS_CMD
+ * register should be set. However some RealTek chips are known
+ * to be buggy on DAC handling, therefore disable DAC by limiting
+ * DMA address space to 32bit. PCIe variants of RealTek chips
+ * may not have the limitation but I took safer path.
+ */
+ error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
+ BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
+ BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT, 0,
+ NULL, NULL, &sc->rl_parent_tag);
+ if (error) {
+ device_printf(dev, "could not allocate parent DMA tag\n");
+ return (error);
+ }
+
/*
+ * Allocate map for TX mbufs.
+ */
+ error = bus_dma_tag_create(sc->rl_parent_tag, 1, 0,
+ BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL,
+ NULL, MCLBYTES * RL_NTXSEGS, RL_NTXSEGS, 4096, 0,
+ NULL, NULL, &sc->rl_ldata.rl_tx_mtag);
+ if (error) {
+ device_printf(dev, "could not allocate TX DMA tag\n");
+ return (error);
+ }
+
+ /*
* Allocate map for RX mbufs.
*/
- nseg = 32;
- error = bus_dma_tag_create(sc->rl_parent_tag, ETHER_ALIGN, 0,
- BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL,
- NULL, MCLBYTES * nseg, nseg, MCLBYTES, BUS_DMA_ALLOCNOW,
- NULL, NULL, &sc->rl_ldata.rl_mtag);
+
+ error = bus_dma_tag_create(sc->rl_parent_tag, sizeof(uint64_t), 0,
+ BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL, NULL,
+ MCLBYTES, 1, MCLBYTES, 0, NULL, NULL, &sc->rl_ldata.rl_rx_mtag);
if (error) {
- device_printf(dev, "could not allocate dma tag\n");
- return (ENOMEM);
+ device_printf(dev, "could not allocate RX DMA tag\n");
+ return (error);
}
/*
@@ -1093,36 +1033,44 @@
*/
error = bus_dma_tag_create(sc->rl_parent_tag, RL_RING_ALIGN,
0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL,
- NULL, RL_TX_LIST_SZ, 1, RL_TX_LIST_SZ, 0,
+ NULL, tx_list_size, 1, tx_list_size, 0,
NULL, NULL, &sc->rl_ldata.rl_tx_list_tag);
if (error) {
- device_printf(dev, "could not allocate dma tag\n");
- return (ENOMEM);
+ device_printf(dev, "could not allocate TX DMA ring tag\n");
+ return (error);
}
/* Allocate DMA'able memory for the TX ring */
error = bus_dmamem_alloc(sc->rl_ldata.rl_tx_list_tag,
- (void **)&sc->rl_ldata.rl_tx_list, BUS_DMA_NOWAIT | BUS_DMA_ZERO,
+ (void **)&sc->rl_ldata.rl_tx_list,
+ BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO,
&sc->rl_ldata.rl_tx_list_map);
- if (error)
- return (ENOMEM);
+ if (error) {
+ device_printf(dev, "could not allocate TX DMA ring\n");
+ return (error);
+ }
/* Load the map for the TX ring. */
+ sc->rl_ldata.rl_tx_list_addr = 0;
error = bus_dmamap_load(sc->rl_ldata.rl_tx_list_tag,
sc->rl_ldata.rl_tx_list_map, sc->rl_ldata.rl_tx_list,
- RL_TX_LIST_SZ, re_dma_map_addr,
+ tx_list_size, re_dma_map_addr,
&sc->rl_ldata.rl_tx_list_addr, BUS_DMA_NOWAIT);
+ if (error != 0 || sc->rl_ldata.rl_tx_list_addr == 0) {
+ device_printf(dev, "could not load TX DMA ring\n");
+ return (ENOMEM);
+ }
/* Create DMA maps for TX buffers */
- for (i = 0; i < RL_TX_DESC_CNT; i++) {
- error = bus_dmamap_create(sc->rl_ldata.rl_mtag, 0,
- &sc->rl_ldata.rl_tx_dmamap[i]);
+ for (i = 0; i < sc->rl_ldata.rl_tx_desc_cnt; i++) {
+ error = bus_dmamap_create(sc->rl_ldata.rl_tx_mtag, 0,
+ &sc->rl_ldata.rl_tx_desc[i].tx_dmamap);
if (error) {
- device_printf(dev, "can't create DMA map for TX\n");
- return (ENOMEM);
+ device_printf(dev, "could not create DMA map for TX\n");
+ return (error);
}
}
@@ -1131,36 +1079,50 @@
*/
error = bus_dma_tag_create(sc->rl_parent_tag, RL_RING_ALIGN,
0, BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL,
- NULL, RL_RX_LIST_SZ, 1, RL_RX_LIST_SZ, 0,
+ NULL, rx_list_size, 1, rx_list_size, 0,
NULL, NULL, &sc->rl_ldata.rl_rx_list_tag);
if (error) {
- device_printf(dev, "could not allocate dma tag\n");
- return (ENOMEM);
+ device_printf(dev, "could not create RX DMA ring tag\n");
+ return (error);
}
/* Allocate DMA'able memory for the RX ring */
error = bus_dmamem_alloc(sc->rl_ldata.rl_rx_list_tag,
- (void **)&sc->rl_ldata.rl_rx_list, BUS_DMA_NOWAIT | BUS_DMA_ZERO,
+ (void **)&sc->rl_ldata.rl_rx_list,
+ BUS_DMA_WAITOK | BUS_DMA_COHERENT | BUS_DMA_ZERO,
&sc->rl_ldata.rl_rx_list_map);
- if (error)
- return (ENOMEM);
+ if (error) {
+ device_printf(dev, "could not allocate RX DMA ring\n");
+ return (error);
+ }
/* Load the map for the RX ring. */
+ sc->rl_ldata.rl_rx_list_addr = 0;
error = bus_dmamap_load(sc->rl_ldata.rl_rx_list_tag,
sc->rl_ldata.rl_rx_list_map, sc->rl_ldata.rl_rx_list,
- RL_RX_LIST_SZ, re_dma_map_addr,
+ rx_list_size, re_dma_map_addr,
&sc->rl_ldata.rl_rx_list_addr, BUS_DMA_NOWAIT);
+ if (error != 0 || sc->rl_ldata.rl_rx_list_addr == 0) {
+ device_printf(dev, "could not load RX DMA ring\n");
+ return (ENOMEM);
+ }
/* Create DMA maps for RX buffers */
- for (i = 0; i < RL_RX_DESC_CNT; i++) {
- error = bus_dmamap_create(sc->rl_ldata.rl_mtag, 0,
- &sc->rl_ldata.rl_rx_dmamap[i]);
+ error = bus_dmamap_create(sc->rl_ldata.rl_rx_mtag, 0,
+ &sc->rl_ldata.rl_rx_sparemap);
+ if (error) {
+ device_printf(dev, "could not create spare DMA map for RX\n");
+ return (error);
+ }
+ for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++) {
+ error = bus_dmamap_create(sc->rl_ldata.rl_rx_mtag, 0,
+ &sc->rl_ldata.rl_rx_desc[i].rx_dmamap);
if (error) {
- device_printf(dev, "can't create DMA map for RX\n");
- return (ENOMEM);
+ device_printf(dev, "could not create DMA map for RX\n");
+ return (error);
}
}
@@ -1184,6 +1146,7 @@
u_int16_t re_did = 0;
int error = 0, rid, i;
int msic, reg;
+ uint8_t cfg;
sc = device_get_softc(dev);
sc->rl_dev = dev;
@@ -1222,6 +1185,12 @@
device_printf(dev, "Using %d MSI messages\n",
msic);
sc->rl_msi = 1;
+ /* Explicitly set MSI enable bit. */
+ CSR_WRITE_1(sc, RL_EECMD, RL_EE_MODE);
+ cfg = CSR_READ_1(sc, RL_CFG2);
+ cfg |= RL_CFG2_MSI;
+ CSR_WRITE_1(sc, RL_CFG2, cfg);
+ CSR_WRITE_1(sc, RL_EECMD, 0);
} else
pci_release_msi(dev);
}
@@ -1265,6 +1234,11 @@
}
hw_rev++;
}
+ if (hw_rev->rl_desc == NULL) {
+ device_printf(dev, "Unknown H/W revision: %08x\n", hwrev);
+ error = ENXIO;
+ goto fail;
+ }
sc->rl_eewidth = RL_9356_ADDR_LEN;
re_read_eeprom(sc, (caddr_t)&re_did, 0, 1);
@@ -1280,28 +1254,25 @@
bcopy(as, eaddr, sizeof(eaddr));
if (sc->rl_type == RL_8169) {
- /* Set RX length mask */
+ /* Set RX length mask and number of descriptors. */
sc->rl_rxlenmask = RL_RDESC_STAT_GFRAGLEN;
sc->rl_txstart = RL_GTXSTART;
+ sc->rl_ldata.rl_tx_desc_cnt = RL_8169_TX_DESC_CNT;
+ sc->rl_ldata.rl_rx_desc_cnt = RL_8169_RX_DESC_CNT;
} else {
- /* Set RX length mask */
+ /* Set RX length mask and number of descriptors. */
sc->rl_rxlenmask = RL_RDESC_STAT_FRAGLEN;
sc->rl_txstart = RL_TXSTART;
+ sc->rl_ldata.rl_tx_desc_cnt = RL_8139_TX_DESC_CNT;
+ sc->rl_ldata.rl_rx_desc_cnt = RL_8139_RX_DESC_CNT;
}
-
- /*
- * Allocate the parent bus DMA tag appropriate for PCI.
- */
-#define RL_NSEG_NEW 32
- error = bus_dma_tag_create(bus_get_dma_tag(dev), 1, 0,
- BUS_SPACE_MAXADDR_32BIT, BUS_SPACE_MAXADDR, NULL, NULL,
- MAXBSIZE, RL_NSEG_NEW, BUS_SPACE_MAXSIZE_32BIT, 0,
- NULL, NULL, &sc->rl_parent_tag);
- if (error)
+ if (hw_rev->rl_desc == NULL) {
+ device_printf(dev, "Unsupported revision : 0x%08x\n", hwrev);
+ error = ENXIO;
goto fail;
+ }
error = re_allocmem(dev, sc);
-
if (error)
goto fail;
@@ -1348,8 +1319,8 @@
ifp->if_flags = IFF_BROADCAST | IFF_SIMPLEX | IFF_MULTICAST;
ifp->if_ioctl = re_ioctl;
ifp->if_start = re_start;
- ifp->if_hwassist = RE_CSUM_FEATURES;
- ifp->if_capabilities = IFCAP_HWCSUM;
+ ifp->if_hwassist = RE_CSUM_FEATURES | CSUM_TSO;
+ ifp->if_capabilities = IFCAP_HWCSUM | IFCAP_TSO4;
ifp->if_capenable = ifp->if_capabilities;
ifp->if_init = re_init;
IFQ_SET_MAXLEN(&ifp->if_snd, RL_IFQ_MAXLEN);
@@ -1368,6 +1339,9 @@
ifp->if_capabilities |= IFCAP_VLAN_MTU | IFCAP_VLAN_HWTAGGING;
if (ifp->if_capabilities & IFCAP_HWCSUM)
ifp->if_capabilities |= IFCAP_VLAN_HWCSUM;
+ /* Enable WOL if PM is supported. */
+ if (pci_find_extcap(sc->rl_dev, PCIY_PMG, ®) == 0)
+ ifp->if_capabilities |= IFCAP_WOL;
ifp->if_capenable = ifp->if_capabilities;
#ifdef DEVICE_POLLING
ifp->if_capabilities |= IFCAP_POLLING;
@@ -1534,14 +1508,20 @@
/* Destroy all the RX and TX buffer maps */
- if (sc->rl_ldata.rl_mtag) {
- for (i = 0; i < RL_TX_DESC_CNT; i++)
- bus_dmamap_destroy(sc->rl_ldata.rl_mtag,
- sc->rl_ldata.rl_tx_dmamap[i]);
- for (i = 0; i < RL_RX_DESC_CNT; i++)
- bus_dmamap_destroy(sc->rl_ldata.rl_mtag,
- sc->rl_ldata.rl_rx_dmamap[i]);
- bus_dma_tag_destroy(sc->rl_ldata.rl_mtag);
+ if (sc->rl_ldata.rl_tx_mtag) {
+ for (i = 0; i < sc->rl_ldata.rl_tx_desc_cnt; i++)
+ bus_dmamap_destroy(sc->rl_ldata.rl_tx_mtag,
+ sc->rl_ldata.rl_tx_desc[i].tx_dmamap);
+ bus_dma_tag_destroy(sc->rl_ldata.rl_tx_mtag);
+ }
+ if (sc->rl_ldata.rl_rx_mtag) {
+ for (i = 0; i < sc->rl_ldata.rl_rx_desc_cnt; i++)
+ bus_dmamap_destroy(sc->rl_ldata.rl_rx_mtag,
+ sc->rl_ldata.rl_rx_desc[i].rx_dmamap);
+ if (sc->rl_ldata.rl_rx_sparemap)
+ bus_dmamap_destroy(sc->rl_ldata.rl_rx_mtag,
+ sc->rl_ldata.rl_rx_sparemap);
+ bus_dma_tag_destroy(sc->rl_ldata.rl_rx_mtag);
}
/* Unload and free the stats buffer and map */
@@ -1563,23 +1543,40 @@
return (0);
}
+static __inline void
+re_discard_rxbuf(sc, idx)
+ struct rl_softc *sc;
+ int idx;
+{
+ struct rl_desc *desc;
+ struct rl_rxdesc *rxd;
+ uint32_t cmdstat;
+
+ rxd = &sc->rl_ldata.rl_rx_desc[idx];
+ desc = &sc->rl_ldata.rl_rx_list[idx];
+ desc->rl_vlanctl = 0;
+ cmdstat = rxd->rx_size;
+ if (idx == sc->rl_ldata.rl_rx_desc_cnt - 1)
+ cmdstat |= RL_RDESC_CMD_EOR;
+ desc->rl_cmdstat = htole32(cmdstat | RL_RDESC_CMD_OWN);
+}
+
static int
-re_newbuf(sc, idx, m)
+re_newbuf(sc, idx)
struct rl_softc *sc;
int idx;
+{
struct mbuf *m;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 11:51:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id DCFD51065671; Tue, 22 Apr 2008 11:51:45 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 9F34D106566B
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 11:51:45 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 64FBE8FC19
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 11:51:45 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MBpjn3033795
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 11:51:45 GMT
(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MBpjNZ033793
for perforce@freebsd.org; Tue, 22 Apr 2008 11:51:45 GMT
(envelope-from gonzo@FreeBSD.org)
Date: Tue, 22 Apr 2008 11:51:45 GMT
Message-Id: <200804221151.m3MBpjNZ033793@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140399 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 11:51:46 -0000
http://perforce.freebsd.org/chv.cgi?CH=140399
Change 140399 by gonzo@gonzo_jeeves on 2008/04/22 11:51:15
o ld wants tradmips so give it tradmips
Affected files ...
.. //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips#3 edit
Differences ...
==== //depot/projects/mips2-jnpr/src/sys/conf/ldscript.mips#3 (text+ko) ====
@@ -1,5 +1,5 @@
/* $FreeBSD$ */
-OUTPUT_FORMAT("elf32-bigmips", "elf32-bigmips", "elf32-littlemips")
+OUTPUT_FORMAT("elf32-tradbigmips", "elf32-tradbigmips", "elf32-tradlittlemips")
OUTPUT_ARCH(mips)
ENTRY(_start)
SEARCH_DIR(/usr/lib);
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 13:08:06 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 39BD11065677; Tue, 22 Apr 2008 13:08:06 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id F06021065672
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 13:08:05 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id B3A2A8FC22
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 13:08:05 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MD85Hv048073
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 13:08:05 GMT
(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MD85xI048071
for perforce@freebsd.org; Tue, 22 Apr 2008 13:08:05 GMT
(envelope-from rpaulo@FreeBSD.org)
Date: Tue, 22 Apr 2008 13:08:05 GMT
Message-Id: <200804221308.m3MD85xI048071@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140403 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 13:08:06 -0000
http://perforce.freebsd.org/chv.cgi?CH=140403
Change 140403 by rpaulo@rpaulo_epsilon on 2008/04/22 13:08:04
README placeholder.
Affected files ...
.. //depot/projects/soc2008/rpaulo-tcpad/README#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 15:20:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 7E1531065679; Tue, 22 Apr 2008 15:20:29 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 3F7A21065674
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 15:20:29 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 00B258FC0C
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 15:20:29 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MFKSQk057830
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 15:20:28 GMT
(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MFKSTw057828
for perforce@freebsd.org; Tue, 22 Apr 2008 15:20:28 GMT
(envelope-from rpaulo@FreeBSD.org)
Date: Tue, 22 Apr 2008 15:20:28 GMT
Message-Id: <200804221520.m3MFKSTw057828@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140411 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 15:20:29 -0000
http://perforce.freebsd.org/chv.cgi?CH=140411
Change 140411 by rpaulo@rpaulo_epsilon on 2008/04/22 15:19:39
Initial code that deals mostly with libpcap.
Affected files ...
.. //depot/projects/soc2008/rpaulo-tcpad/Makefile#1 add
.. //depot/projects/soc2008/rpaulo-tcpad/device.c#1 add
.. //depot/projects/soc2008/rpaulo-tcpad/linkhdr.c#1 add
.. //depot/projects/soc2008/rpaulo-tcpad/main.c#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 15:33:43 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 139481065688; Tue, 22 Apr 2008 15:33:43 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C62DB1065682
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 15:33:42 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 88D038FC15
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 15:33:42 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MFXgqI058520
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 15:33:42 GMT
(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MFXgDN058518
for perforce@freebsd.org; Tue, 22 Apr 2008 15:33:42 GMT
(envelope-from rpaulo@FreeBSD.org)
Date: Tue, 22 Apr 2008 15:33:42 GMT
Message-Id: <200804221533.m3MFXgDN058518@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140413 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 15:33:43 -0000
http://perforce.freebsd.org/chv.cgi?CH=140413
Change 140413 by rpaulo@rpaulo_epsilon on 2008/04/22 15:33:19
Reading material.
Affected files ...
.. //depot/projects/soc2008/rpaulo-tcpad/READING#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 19:23:02 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9DF5B106566B; Tue, 22 Apr 2008 19:23:02 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 5DC501065676
for <perforce@freebsd.org>; Tue, 22 Apr 2008 19:23:02 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 464768FC34
for <perforce@freebsd.org>; Tue, 22 Apr 2008 19:23:02 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MJN2Nu092626
for <perforce@freebsd.org>; Tue, 22 Apr 2008 19:23:02 GMT
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MJMuGZ092620
for perforce@freebsd.org; Tue, 22 Apr 2008 19:22:56 GMT
(envelope-from marcel@freebsd.org)
Date: Tue, 22 Apr 2008 19:22:56 GMT
Message-Id: <200804221922.m3MJMuGZ092620@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140423 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 19:23:02 -0000
http://perforce.freebsd.org/chv.cgi?CH=140423
Change 140423 by marcel@marcel_fbsdvm on 2008/04/22 19:22:24
IFC @140422
Affected files ...
.. //depot/projects/bdb/Makefile#2 integrate
.. //depot/projects/bdb/Makefile.inc1#2 integrate
.. //depot/projects/bdb/ObsoleteFiles.inc#4 integrate
.. //depot/projects/bdb/UPDATING#3 integrate
.. //depot/projects/bdb/bin/ls/ls.1#2 integrate
.. //depot/projects/bdb/bin/ls/ls.c#2 integrate
.. //depot/projects/bdb/bin/ls/ls.h#2 integrate
.. //depot/projects/bdb/bin/ls/print.c#2 integrate
.. //depot/projects/bdb/bin/ls/util.c#2 integrate
.. //depot/projects/bdb/bin/sh/options.c#2 integrate
.. //depot/projects/bdb/cddl/Makefile.inc#2 integrate
.. //depot/projects/bdb/cddl/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/bdb/cddl/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/head/assert.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/head/atomic.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/head/libintl.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/head/synch.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/head/thread.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch
.. //depot/projects/bdb/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch
.. //depot/projects/bdb/cddl/lib/Makefile#2 integrate
.. //depot/projects/bdb/cddl/lib/libavl/Makefile#2 integrate
.. //depot/projects/bdb/cddl/lib/libnvpair/Makefile#2 integrate
.. //depot/projects/bdb/cddl/lib/libumem/Makefile#2 integrate
.. //depot/projects/bdb/cddl/lib/libuutil/Makefile#2 integrate
.. //depot/projects/bdb/cddl/lib/libzfs/Makefile#2 integrate
.. //depot/projects/bdb/cddl/lib/libzpool/Makefile#2 integrate
.. //depot/projects/bdb/cddl/sbin/zfs/Makefile#2 integrate
.. //depot/projects/bdb/cddl/sbin/zpool/Makefile#2 integrate
.. //depot/projects/bdb/cddl/usr.bin/Makefile#2 integrate
.. //depot/projects/bdb/cddl/usr.bin/ztest/Makefile#2 integrate
.. //depot/projects/bdb/cddl/usr.sbin/Makefile#2 integrate
.. //depot/projects/bdb/cddl/usr.sbin/zdb/Makefile#2 integrate
.. //depot/projects/bdb/compat/opensolaris/include/alloca.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/devid.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/fcntl.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/fsshare.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/libintl.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/mnttab.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/priv.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/solaris.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/stdio.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/stdlib.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/strings.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/unistd.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/include/zone.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/lib/libumem/umem.c#2 delete
.. //depot/projects/bdb/compat/opensolaris/lib/libumem/umem.h#2 delete
.. //depot/projects/bdb/compat/opensolaris/misc/deviceid.c#2 delete
.. //depot/projects/bdb/compat/opensolaris/misc/fsshare.c#2 delete
.. //depot/projects/bdb/compat/opensolaris/misc/mkdirp.c#2 delete
.. //depot/projects/bdb/compat/opensolaris/misc/mnttab.c#2 delete
.. //depot/projects/bdb/compat/opensolaris/misc/zmount.c#2 delete
.. //depot/projects/bdb/compat/opensolaris/misc/zone.c#2 delete
.. //depot/projects/bdb/contrib/bzip2/CHANGES#2 integrate
.. //depot/projects/bdb/contrib/bzip2/FREEBSD-upgrade#2 integrate
.. //depot/projects/bdb/contrib/bzip2/FREEBSD-vendor#1 branch
.. //depot/projects/bdb/contrib/bzip2/LICENSE#2 integrate
.. //depot/projects/bdb/contrib/bzip2/Makefile#2 integrate
.. //depot/projects/bdb/contrib/bzip2/Makefile-libbz2_so#2 integrate
.. //depot/projects/bdb/contrib/bzip2/README#2 integrate
.. //depot/projects/bdb/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate
.. //depot/projects/bdb/contrib/bzip2/blocksort.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/bzip2.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/bzip2recover.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/bzlib.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/bzlib.h#2 integrate
.. //depot/projects/bdb/contrib/bzip2/bzlib_private.h#2 integrate
.. //depot/projects/bdb/contrib/bzip2/compress.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/crctable.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/decompress.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/huffman.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/randtable.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/spewG.c#2 integrate
.. //depot/projects/bdb/contrib/bzip2/unzcrash.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/ChangeLog#2 integrate
.. //depot/projects/bdb/contrib/cvs/FAQ#2 integrate
.. //depot/projects/bdb/contrib/cvs/HACKING#2 integrate
.. //depot/projects/bdb/contrib/cvs/INSTALL#2 integrate
.. //depot/projects/bdb/contrib/cvs/Makefile.in#2 integrate
.. //depot/projects/bdb/contrib/cvs/NEWS#2 integrate
.. //depot/projects/bdb/contrib/cvs/README#2 integrate
.. //depot/projects/bdb/contrib/cvs/TODO#2 integrate
.. //depot/projects/bdb/contrib/cvs/aclocal.m4#2 integrate
.. //depot/projects/bdb/contrib/cvs/compile#2 integrate
.. //depot/projects/bdb/contrib/cvs/config.h.in#2 integrate
.. //depot/projects/bdb/contrib/cvs/configure#2 integrate
.. //depot/projects/bdb/contrib/cvs/configure.in#2 integrate
.. //depot/projects/bdb/contrib/cvs/contrib/Makefile.in#2 integrate
.. //depot/projects/bdb/contrib/cvs/depcomp#2 integrate
.. //depot/projects/bdb/contrib/cvs/diff/Makefile.in#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/ChangeLog#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/HACKING.DOCS#1 branch
.. //depot/projects/bdb/contrib/cvs/doc/Makefile.in#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/cvs.1#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/cvs.texinfo#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/cvsclient.texi#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/mdate-sh#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/mkman.pl#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/stamp-1#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/stamp-vti#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/version-client.texi#2 integrate
.. //depot/projects/bdb/contrib/cvs/doc/version.texi#2 integrate
.. //depot/projects/bdb/contrib/cvs/install-sh#2 integrate
.. //depot/projects/bdb/contrib/cvs/lib/ChangeLog#2 integrate
.. //depot/projects/bdb/contrib/cvs/lib/Makefile.in#2 integrate
.. //depot/projects/bdb/contrib/cvs/lib/xsize.h#2 integrate
.. //depot/projects/bdb/contrib/cvs/man/Makefile.in#2 integrate
.. //depot/projects/bdb/contrib/cvs/missing#2 integrate
.. //depot/projects/bdb/contrib/cvs/mkinstalldirs#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/ChangeLog#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/Makefile.in#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/add.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/classify.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/client.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/client.h#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/cvs.h#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/edit.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/edit.h#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/hash.h#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/import.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/lock.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/log.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/login.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/main.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/mkmodules.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/modules.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/parseinfo.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/rcs.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/recurse.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/root.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/root.h#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/sanity.sh#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/server.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/update.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/src/vers_ts.c#2 integrate
.. //depot/projects/bdb/contrib/cvs/tools/Makefile.in#2 integrate
.. //depot/projects/bdb/contrib/gcc/gthr-posix.h#2 integrate
.. //depot/projects/bdb/contrib/hostapd/ChangeLog#2 integrate
.. //depot/projects/bdb/contrib/hostapd/Makefile#2 integrate
.. //depot/projects/bdb/contrib/hostapd/README#2 integrate
.. //depot/projects/bdb/contrib/hostapd/aes_wrap.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/aes_wrap.h#2 integrate
.. //depot/projects/bdb/contrib/hostapd/common.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/common.h#2 integrate
.. //depot/projects/bdb/contrib/hostapd/defconfig#2 integrate
.. //depot/projects/bdb/contrib/hostapd/driver.h#2 integrate
.. //depot/projects/bdb/contrib/hostapd/driver_test.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/driver_wired.c#2 delete
.. //depot/projects/bdb/contrib/hostapd/eap_aka.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/eap_gpsk.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/eap_gpsk_common.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/eap_gpsk_common.h#2 integrate
.. //depot/projects/bdb/contrib/hostapd/eap_sim.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/eap_sim_common.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/eap_sim_db.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/eap_tls_common.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/eapol_version.patch#2 delete
.. //depot/projects/bdb/contrib/hostapd/hostapd.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/hostapd.conf#2 integrate
.. //depot/projects/bdb/contrib/hostapd/ieee802_11.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/ieee802_11_auth.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/ieee802_1x.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/madwifi.conf#2 integrate
.. //depot/projects/bdb/contrib/hostapd/os.h#2 integrate
.. //depot/projects/bdb/contrib/hostapd/os_unix.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/radius.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/radius.h#2 integrate
.. //depot/projects/bdb/contrib/hostapd/radius_client.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/radius_server.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/tls_openssl.c#2 integrate
.. //depot/projects/bdb/contrib/hostapd/version.h#2 integrate
.. //depot/projects/bdb/contrib/hostapd/wpa.c#2 integrate
.. //depot/projects/bdb/contrib/netcat/FREEBSD-upgrade#2 integrate
.. //depot/projects/bdb/contrib/netcat/FREEBSD-vendor#1 branch
.. //depot/projects/bdb/contrib/netcat/atomicio.c#2 integrate
.. //depot/projects/bdb/contrib/netcat/atomicio.h#2 integrate
.. //depot/projects/bdb/contrib/netcat/nc.1#2 integrate
.. //depot/projects/bdb/contrib/netcat/netcat.c#2 integrate
.. //depot/projects/bdb/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zdb/zdb.8#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zdb/zdb.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zfs/zfs.8#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zfs/zfs_main.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zpool/zpool.8#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/cmd/ztest/ztest.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/head/assert.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/head/atomic.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/head/libintl.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/head/stdio_ext.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/head/synch.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/head/thread.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzpool/common/kernel.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete
.. //depot/projects/bdb/contrib/opensolaris/lib/libzpool/common/util.c#2 delete
.. //depot/projects/bdb/contrib/pf/pfctl/pfctl_altq.c#2 integrate
.. //depot/projects/bdb/contrib/pf/pfctl/pfctl_qstats.c#2 integrate
.. //depot/projects/bdb/contrib/top/machine.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/ChangeLog#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/README#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/aes_wrap.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/aes_wrap.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/asn1.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/common.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/common.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/config.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/config_ssid.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/config_winreg.c#2 delete
.. //depot/projects/bdb/contrib/wpa_supplicant/ctrl_iface.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/ctrl_iface_named_pipe.c#2 delete
.. //depot/projects/bdb/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/bdb/contrib/wpa_supplicant/defconfig#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/driver_hostap.h#2 delete
.. //depot/projects/bdb/contrib/wpa_supplicant/driver_ndis.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eap_gpsk.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eap_peap.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eap_sim.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eap_sim_common.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eap_tlv.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eap_tlv.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eapol_sm.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eapol_test.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/eloop_win.c#2 delete
.. //depot/projects/bdb/contrib/wpa_supplicant/events.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/main.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/os.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/os_unix.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/radius.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/radius.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/radius_client.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/tests/test_aes.c#1 branch
.. //depot/projects/bdb/contrib/wpa_supplicant/tests/test_eap_sim_common.c#1 branch
.. //depot/projects/bdb/contrib/wpa_supplicant/tests/test_md4.c#1 branch
.. //depot/projects/bdb/contrib/wpa_supplicant/tests/test_md5.c#1 branch
.. //depot/projects/bdb/contrib/wpa_supplicant/tests/test_ms_funcs.c#1 branch
.. //depot/projects/bdb/contrib/wpa_supplicant/tests/test_sha1.c#1 branch
.. //depot/projects/bdb/contrib/wpa_supplicant/tests/test_sha256.c#1 branch
.. //depot/projects/bdb/contrib/wpa_supplicant/tests/test_x509v3.c#1 branch
.. //depot/projects/bdb/contrib/wpa_supplicant/tls_openssl.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/version.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa_cli.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate
.. //depot/projects/bdb/contrib/wpa_supplicant/x509v3.c#2 integrate
.. //depot/projects/bdb/etc/Makefile#3 integrate
.. //depot/projects/bdb/etc/defaults/rc.conf#3 integrate
.. //depot/projects/bdb/etc/freebsd-update.conf#2 integrate
.. //depot/projects/bdb/etc/network.subr#2 integrate
.. //depot/projects/bdb/etc/newsyslog.conf#2 integrate
.. //depot/projects/bdb/etc/periodic/security/410.logincheck#2 integrate
.. //depot/projects/bdb/etc/rc.d/Makefile#3 integrate
.. //depot/projects/bdb/etc/rc.d/dhclient#2 integrate
.. //depot/projects/bdb/etc/rc.d/hostapd#2 integrate
.. //depot/projects/bdb/etc/rc.d/initrandom#2 integrate
.. //depot/projects/bdb/etc/rc.d/netif#2 integrate
.. //depot/projects/bdb/etc/rc.d/ppp#2 integrate
.. //depot/projects/bdb/etc/rc.d/rfcomm_pppd_server#1 branch
.. //depot/projects/bdb/etc/rc.d/wpa_supplicant#2 integrate
.. //depot/projects/bdb/etc/rc.d/zfs#2 integrate
.. //depot/projects/bdb/etc/regdomain.xml#1 branch
.. //depot/projects/bdb/games/fortune/datfiles/fortunes#3 integrate
.. //depot/projects/bdb/gnu/usr.bin/Makefile#2 integrate
.. //depot/projects/bdb/gnu/usr.bin/binutils/libbfd/Makefile.i386#2 integrate
.. //depot/projects/bdb/gnu/usr.bin/cvs/lib/Makefile#2 integrate
.. //depot/projects/bdb/gnu/usr.bin/cvs/lib/config.h.proto#2 integrate
.. //depot/projects/bdb/gnu/usr.bin/gdb/kgdb/kld.c#2 integrate
.. //depot/projects/bdb/gnu/usr.bin/gdb/kgdb/main.c#2 integrate
.. //depot/projects/bdb/include/complex.h#2 integrate
.. //depot/projects/bdb/include/dirent.h#2 integrate
.. //depot/projects/bdb/include/pthread.h#2 integrate
.. //depot/projects/bdb/include/stdio.h#2 integrate
.. //depot/projects/bdb/include/string.h#2 integrate
.. //depot/projects/bdb/include/time.h#2 integrate
.. //depot/projects/bdb/include/unistd.h#2 integrate
.. //depot/projects/bdb/lib/libarchive/Makefile#3 integrate
.. //depot/projects/bdb/lib/libarchive/archive_entry_private.h#2 integrate
.. //depot/projects/bdb/lib/libc/gdtoa/Makefile.inc#2 integrate
.. //depot/projects/bdb/lib/libc/gdtoa/_hdtoa.c#2 integrate
.. //depot/projects/bdb/lib/libc/gdtoa/_hldtoa.c#1 branch
.. //depot/projects/bdb/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/bdb/lib/libc/gen/Symbol.map#2 integrate
.. //depot/projects/bdb/lib/libc/gen/directory.3#2 integrate
.. //depot/projects/bdb/lib/libc/gen/err.c#2 integrate
.. //depot/projects/bdb/lib/libc/gen/lockf.c#2 integrate
.. //depot/projects/bdb/lib/libc/gen/modf.3#2 integrate
.. //depot/projects/bdb/lib/libc/gen/msgctl.3#2 integrate
.. //depot/projects/bdb/lib/libc/gen/opendir.c#2 integrate
.. //depot/projects/bdb/lib/libc/gen/sysctl.3#2 integrate
.. //depot/projects/bdb/lib/libc/gen/tcgetsid.3#1 branch
.. //depot/projects/bdb/lib/libc/gen/termios.c#2 integrate
.. //depot/projects/bdb/lib/libc/include/libc_private.h#2 integrate
.. //depot/projects/bdb/lib/libc/include/namespace.h#2 integrate
.. //depot/projects/bdb/lib/libc/include/un-namespace.h#2 integrate
.. //depot/projects/bdb/lib/libc/rpc/svc_vc.c#2 integrate
.. //depot/projects/bdb/lib/libc/sparc64/fpu/fpu_qp.c#2 integrate
.. //depot/projects/bdb/lib/libc/sparc64/fpu/fpu_sqrt.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/_flock_stub.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/asprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/fgetwc.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/fgetws.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/findfp.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/fopen.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/fputwc.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/fputws.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/freopen.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/fseek.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/fwide.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/local.h#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/printf.3#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/refill.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/snprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/sprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/sscanf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/ungetc.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/ungetwc.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/vasprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/vfprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/vfwprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/vsnprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/vsprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/vsscanf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/vswprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/vswscanf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdio/xprintf.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdlib/strfmon.c#2 integrate
.. //depot/projects/bdb/lib/libc/stdtime/localtime.c#2 integrate
.. //depot/projects/bdb/lib/libc/string/Makefile.inc#2 integrate
.. //depot/projects/bdb/lib/libc/string/Symbol.map#2 integrate
.. //depot/projects/bdb/lib/libc/string/memchr.3#2 integrate
.. //depot/projects/bdb/lib/libc/string/memrchr.c#1 branch
.. //depot/projects/bdb/lib/libc/sys/Makefile.inc#3 integrate
.. //depot/projects/bdb/lib/libc/sys/Symbol.map#3 integrate
.. //depot/projects/bdb/lib/libc/sys/access.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/aio_cancel.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/aio_suspend.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/chmod.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/chown.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/cpuset.2#1 branch
.. //depot/projects/bdb/lib/libc/sys/cpuset_getaffinity.2#1 branch
.. //depot/projects/bdb/lib/libc/sys/execve.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/fcntl.2#3 integrate
.. //depot/projects/bdb/lib/libc/sys/fcntl.c#1 branch
.. //depot/projects/bdb/lib/libc/sys/link.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/mincore.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/mkdir.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/mkfifo.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/mknod.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/open.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/readlink.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/rename.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/stat.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/symlink.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/unlink.2#2 integrate
.. //depot/projects/bdb/lib/libc/sys/utimes.2#2 integrate
.. //depot/projects/bdb/lib/libc/xdr/xdr_rec.c#2 integrate
.. //depot/projects/bdb/lib/libc/yp/xdryp.c#2 integrate
.. //depot/projects/bdb/lib/libc_r/uthread/uthread_sig.c#2 integrate
.. //depot/projects/bdb/lib/libelf/elf_update.3#2 integrate
.. //depot/projects/bdb/lib/libelf/elf_update.c#3 integrate
.. //depot/projects/bdb/lib/libelf/libelf_convert.m4#2 integrate
.. //depot/projects/bdb/lib/libfetch/common.c#2 integrate
.. //depot/projects/bdb/lib/libkse/thread/thr_sig.c#2 integrate
.. //depot/projects/bdb/lib/libstand/nfs.c#2 integrate
.. //depot/projects/bdb/lib/libthr/Makefile#2 integrate
.. //depot/projects/bdb/lib/libthr/arch/amd64/Makefile.inc#2 integrate
.. //depot/projects/bdb/lib/libthr/arch/amd64/amd64/_umtx_op_err.S#1 branch
.. //depot/projects/bdb/lib/libthr/arch/amd64/include/pthread_md.h#2 integrate
.. //depot/projects/bdb/lib/libthr/arch/i386/Makefile.inc#2 integrate
.. //depot/projects/bdb/lib/libthr/arch/i386/i386/_umtx_op_err.S#1 branch
.. //depot/projects/bdb/lib/libthr/arch/i386/include/pthread_md.h#2 integrate
.. //depot/projects/bdb/lib/libthr/pthread.map#3 integrate
.. //depot/projects/bdb/lib/libthr/thread/Makefile.inc#3 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_affinity.c#2 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_attr.c#3 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_cond.c#2 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_create.c#5 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_exit.c#4 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_getcpuclockid.c#1 branch
.. //depot/projects/bdb/lib/libthr/thread/thr_init.c#3 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_mutex.c#2 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_mutexattr.c#2 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_private.h#3 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_rtld.c#2 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_rwlock.c#2 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_umtx.c#2 integrate
.. //depot/projects/bdb/lib/libthr/thread/thr_umtx.h#2 integrate
.. //depot/projects/bdb/lib/libthread_db/Makefile#3 integrate
.. //depot/projects/bdb/lib/libthread_db/kse.h#1 branch
.. //depot/projects/bdb/lib/libthread_db/libc_r_db.c#2 integrate
.. //depot/projects/bdb/lib/libthread_db/libpthread_db.c#2 integrate
.. //depot/projects/bdb/lib/libthread_db/libthr_db.c#2 integrate
.. //depot/projects/bdb/lib/libthread_db/thread_db.c#2 integrate
.. //depot/projects/bdb/lib/msun/Makefile#2 integrate
.. //depot/projects/bdb/lib/msun/Symbol.map#2 integrate
.. //depot/projects/bdb/lib/msun/amd64/Makefile.inc#2 integrate
.. //depot/projects/bdb/lib/msun/amd64/e_remainderl.S#1 branch
.. //depot/projects/bdb/lib/msun/amd64/s_remquol.S#1 branch
.. //depot/projects/bdb/lib/msun/i387/Makefile.inc#2 integrate
.. //depot/projects/bdb/lib/msun/i387/e_remainderl.S#1 branch
.. //depot/projects/bdb/lib/msun/i387/s_remquol.S#1 branch
.. //depot/projects/bdb/lib/msun/man/csqrt.3#2 integrate
.. //depot/projects/bdb/lib/msun/man/hypot.3#2 integrate
.. //depot/projects/bdb/lib/msun/man/remainder.3#2 integrate
.. //depot/projects/bdb/lib/msun/src/e_hypot.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/e_hypotf.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/e_hypotl.c#1 branch
.. //depot/projects/bdb/lib/msun/src/e_log.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/e_logf.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/e_remainder.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/e_remainderl.c#1 branch
.. //depot/projects/bdb/lib/msun/src/math.h#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_csqrt.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_csqrtl.c#1 branch
.. //depot/projects/bdb/lib/msun/src/s_expm1.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_expm1f.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_fma.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_fmaf.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_fmal.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_log1p.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_log1pf.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_remquo.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/s_remquol.c#1 branch
.. //depot/projects/bdb/lib/msun/src/w_cabs.c#2 integrate
.. //depot/projects/bdb/lib/msun/src/w_cabsl.c#1 branch
.. //depot/projects/bdb/libexec/rtld-elf/mips/reloc.c#1 branch
.. //depot/projects/bdb/libexec/rtld-elf/mips/rtld_machdep.h#1 branch
.. //depot/projects/bdb/libexec/rtld-elf/mips/rtld_start.S#1 branch
.. //depot/projects/bdb/libexec/rtld-elf/rtld.c#2 integrate
.. //depot/projects/bdb/libexec/rtld-elf/rtld.h#2 integrate
.. //depot/projects/bdb/libexec/talkd/announce.c#2 integrate
.. //depot/projects/bdb/release/amd64/boot_crunch.conf#2 integrate
.. //depot/projects/bdb/release/doc/en_US.ISO8859-1/hardware/article.sgml#2 integrate
.. //depot/projects/bdb/release/doc/en_US.ISO8859-1/relnotes/article.sgml#3 integrate
.. //depot/projects/bdb/release/doc/share/misc/dev.archlist.txt#3 integrate
.. //depot/projects/bdb/release/doc/share/sgml/release.dsl#2 integrate
.. //depot/projects/bdb/release/doc/share/sgml/release.ent#2 integrate
.. //depot/projects/bdb/release/i386/boot_crunch.conf#2 integrate
.. //depot/projects/bdb/release/ia64/boot_crunch.conf#2 integrate
.. //depot/projects/bdb/release/ia64/mkisoimages.sh#2 integrate
.. //depot/projects/bdb/release/pc98/boot_crunch.conf#2 integrate
.. //depot/projects/bdb/release/picobsd/bridge/crunch.conf#2 integrate
.. //depot/projects/bdb/release/powerpc/boot_crunch.conf#2 integrate
.. //depot/projects/bdb/release/sparc64/boot_crunch.conf#2 integrate
.. //depot/projects/bdb/release/sun4v/boot_crunch.conf#2 integrate
.. //depot/projects/bdb/rescue/rescue/Makefile#3 integrate
.. //depot/projects/bdb/sbin/bsdlabel/bsdlabel.c#2 integrate
.. //depot/projects/bdb/sbin/ddb/ddb.8#3 integrate
.. //depot/projects/bdb/sbin/ddb/ddb.c#3 integrate
.. //depot/projects/bdb/sbin/devd/token.l#2 integrate
.. //depot/projects/bdb/sbin/dhclient/bpf.c#2 integrate
.. //depot/projects/bdb/sbin/dhclient/dhclient-script#2 integrate
.. //depot/projects/bdb/sbin/dhclient/dhclient.c#2 integrate
.. //depot/projects/bdb/sbin/fsck_ffs/fsck.h#2 integrate
.. //depot/projects/bdb/sbin/fsck_ffs/fsck_ffs.8#2 integrate
.. //depot/projects/bdb/sbin/fsck_ffs/fsutil.c#2 integrate
.. //depot/projects/bdb/sbin/fsck_ffs/inode.c#2 integrate
.. //depot/projects/bdb/sbin/fsck_ffs/main.c#3 integrate
.. //depot/projects/bdb/sbin/geom/class/journal/gjournal.8#2 integrate
.. //depot/projects/bdb/sbin/geom/class/part/geom_part.c#2 integrate
.. //depot/projects/bdb/sbin/ggate/Makefile#2 integrate
.. //depot/projects/bdb/sbin/gpt/gpt.c#2 integrate
.. //depot/projects/bdb/sbin/ifconfig/Makefile#2 integrate
.. //depot/projects/bdb/sbin/ifconfig/ifclone.c#2 integrate
.. //depot/projects/bdb/sbin/ifconfig/ifconfig.8#2 integrate
.. //depot/projects/bdb/sbin/ifconfig/ifconfig.c#2 integrate
.. //depot/projects/bdb/sbin/ifconfig/ifconfig.h#2 integrate
.. //depot/projects/bdb/sbin/ifconfig/ifieee80211.c#2 integrate
.. //depot/projects/bdb/sbin/ifconfig/ifmedia.c#2 integrate
.. //depot/projects/bdb/sbin/ifconfig/ifvlan.c#2 integrate
.. //depot/projects/bdb/sbin/ifconfig/regdomain.c#1 branch
.. //depot/projects/bdb/sbin/ifconfig/regdomain.h#1 branch
.. //depot/projects/bdb/sbin/newfs/newfs.8#2 integrate
.. //depot/projects/bdb/sbin/restore/dirs.c#2 integrate
.. //depot/projects/bdb/sbin/restore/interactive.c#2 integrate
.. //depot/projects/bdb/sbin/restore/tape.c#2 integrate
.. //depot/projects/bdb/sbin/route/route.c#2 integrate
.. //depot/projects/bdb/share/man/man3/Makefile#3 integrate
.. //depot/projects/bdb/share/man/man4/Makefile#3 integrate
.. //depot/projects/bdb/share/man/man4/altq.4#2 integrate
.. //depot/projects/bdb/share/man/man4/arcmsr.4#2 integrate
.. //depot/projects/bdb/share/man/man4/asmc.4#2 integrate
.. //depot/projects/bdb/share/man/man4/ath.4#2 integrate
.. //depot/projects/bdb/share/man/man4/awi.4#2 delete
.. //depot/projects/bdb/share/man/man4/bpf.4#2 integrate
.. //depot/projects/bdb/share/man/man4/cnw.4#2 integrate
.. //depot/projects/bdb/share/man/man4/ddb.4#3 integrate
.. //depot/projects/bdb/share/man/man4/ipw.4#2 integrate
.. //depot/projects/bdb/share/man/man4/iwi.4#2 integrate
.. //depot/projects/bdb/share/man/man4/k8temp.4#1 branch
.. //depot/projects/bdb/share/man/man4/malo.4#1 branch
.. //depot/projects/bdb/share/man/man4/man4.i386/streams.4#3 integrate
.. //depot/projects/bdb/share/man/man4/nfe.4#2 integrate
.. //depot/projects/bdb/share/man/man4/ng_pptpgre.4#2 integrate
.. //depot/projects/bdb/share/man/man4/psm.4#2 integrate
.. //depot/projects/bdb/share/man/man4/ral.4#2 integrate
.. //depot/projects/bdb/share/man/man4/rum.4#2 integrate
.. //depot/projects/bdb/share/man/man4/textdump.4#2 integrate
.. //depot/projects/bdb/share/man/man4/ubsa.4#2 integrate
.. //depot/projects/bdb/share/man/man4/ural.4#2 integrate
.. //depot/projects/bdb/share/man/man4/wi.4#2 integrate
.. //depot/projects/bdb/share/man/man4/wlan.4#2 integrate
.. //depot/projects/bdb/share/man/man4/wlan_acl.4#2 integrate
.. //depot/projects/bdb/share/man/man4/wlan_amrr.4#2 integrate
.. //depot/projects/bdb/share/man/man4/wlan_xauth.4#2 integrate
.. //depot/projects/bdb/share/man/man4/wpi.4#2 integrate
.. //depot/projects/bdb/share/man/man4/zyd.4#2 integrate
.. //depot/projects/bdb/share/man/man5/Makefile#2 integrate
.. //depot/projects/bdb/share/man/man5/rc.conf.5#3 integrate
.. //depot/projects/bdb/share/man/man5/regdomain.5#1 branch
.. //depot/projects/bdb/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/bdb/share/man/man7/security.7#2 integrate
.. //depot/projects/bdb/share/man/man8/rc.subr.8#2 integrate
.. //depot/projects/bdb/share/man/man9/Makefile#3 integrate
.. //depot/projects/bdb/share/man/man9/lock.9#3 integrate
.. //depot/projects/bdb/share/man/man9/malloc.9#2 integrate
.. //depot/projects/bdb/share/man/man9/mbchain.9#2 integrate
.. //depot/projects/bdb/share/man/man9/mbuf.9#2 integrate
.. //depot/projects/bdb/share/man/man9/rwlock.9#3 integrate
.. //depot/projects/bdb/share/man/man9/sleep.9#2 integrate
.. //depot/projects/bdb/share/misc/committers-doc.dot#2 integrate
.. //depot/projects/bdb/share/mk/bsd.cpu.mk#3 integrate
.. //depot/projects/bdb/share/mk/bsd.lib.mk#2 integrate
.. //depot/projects/bdb/share/mk/bsd.own.mk#2 integrate
.. //depot/projects/bdb/share/mk/sys.mk#3 integrate
.. //depot/projects/bdb/share/zoneinfo/asia#2 integrate
.. //depot/projects/bdb/share/zoneinfo/backward#2 integrate
.. //depot/projects/bdb/share/zoneinfo/northamerica#2 integrate
.. //depot/projects/bdb/share/zoneinfo/southamerica#3 integrate
.. //depot/projects/bdb/share/zoneinfo/zone.tab#2 integrate
.. //depot/projects/bdb/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/bdb/sys/amd64/amd64/genassym.c#2 integrate
.. //depot/projects/bdb/sys/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/bdb/sys/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/bdb/sys/amd64/amd64/nexus.c#3 integrate
.. //depot/projects/bdb/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/bdb/sys/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/bdb/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/bdb/sys/amd64/conf/NOTES#2 integrate
.. //depot/projects/bdb/sys/amd64/ia32/ia32_signal.c#3 integrate
.. //depot/projects/bdb/sys/amd64/include/clock.h#2 integrate
.. //depot/projects/bdb/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/bdb/sys/amd64/include/param.h#2 integrate
.. //depot/projects/bdb/sys/amd64/include/pcb.h#2 integrate
.. //depot/projects/bdb/sys/amd64/include/pcb_ext.h#2 delete
.. //depot/projects/bdb/sys/amd64/include/timerreg.h#2 integrate
.. //depot/projects/bdb/sys/amd64/isa/atpic.c#3 integrate
.. //depot/projects/bdb/sys/amd64/isa/clock.c#2 integrate
.. //depot/projects/bdb/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/bdb/sys/amd64/linux32/linux32_dummy.c#2 integrate
.. //depot/projects/bdb/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/bdb/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/bdb/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/bdb/sys/amd64/linux32/linux32_sysvec.c#4 integrate
.. //depot/projects/bdb/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/bdb/sys/arm/arm/bus_space_generic.c#1 branch
.. //depot/projects/bdb/sys/arm/arm/elf_trampoline.c#2 integrate
.. //depot/projects/bdb/sys/arm/arm/exception.S#2 integrate
.. //depot/projects/bdb/sys/arm/arm/intr.c#4 integrate
.. //depot/projects/bdb/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/bdb/sys/arm/arm/machdep.c#3 integrate
.. //depot/projects/bdb/sys/arm/at91/at91.c#2 integrate
.. //depot/projects/bdb/sys/arm/at91/kb920x_machdep.c#2 integrate
.. //depot/projects/bdb/sys/arm/conf/AVILA#3 integrate
.. //depot/projects/bdb/sys/arm/conf/AVILA.hints#2 integrate
.. //depot/projects/bdb/sys/arm/conf/BWCT#2 integrate
.. //depot/projects/bdb/sys/arm/conf/CRB#2 integrate
.. //depot/projects/bdb/sys/arm/conf/EP80219#2 integrate
.. //depot/projects/bdb/sys/arm/conf/HL200#2 integrate
.. //depot/projects/bdb/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/bdb/sys/arm/conf/KB920X#2 integrate
.. //depot/projects/bdb/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/bdb/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/bdb/sys/arm/include/intr.h#2 integrate
.. //depot/projects/bdb/sys/arm/include/machdep.h#2 integrate
.. //depot/projects/bdb/sys/arm/include/param.h#2 integrate
.. //depot/projects/bdb/sys/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/bdb/sys/arm/sa11x0/files.sa11x0#2 integrate
.. //depot/projects/bdb/sys/arm/sa11x0/sa11x0_io.c#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/i80321/files.ep80219#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/i80321/files.i80219#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/i80321/files.i80321#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/i80321/files.iq31244#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/i80321/obio_space.c#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate
.. //depot/projects/bdb/sys/arm/xscale/i8134x/files.i81342#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/i8134x/obio_space.c#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/ixp425/avila_machdep.c#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/ixp425/files.avila#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/ixp425/if_npe.c#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate
.. //depot/projects/bdb/sys/arm/xscale/ixp425/ixp425_space.c#2 integrate
.. //depot/projects/bdb/sys/boot/forth/loader.conf#2 integrate
.. //depot/projects/bdb/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/bdb/sys/boot/i386/pxeldr/pxeldr.S#3 integrate
.. //depot/projects/bdb/sys/boot/pc98/cdboot/cdboot.s#2 integrate
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/machine/endian.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/acl.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/callb.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/cred.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/debug.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/lock.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/misc.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/mount.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/policy.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/proc.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/random.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/string.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/systm.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/time.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/types.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/uio.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch
.. //depot/projects/bdb/sys/cddl/compat/opensolaris/sys/zone.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/Makefile.files#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/gfs.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bplist.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dbuf.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_object.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_objset.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_send.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_traverse.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_tx.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dmu_zfetch.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dnode_sync.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dataset.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_dir.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_pool.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_prop.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/dsl_synctask.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/fletcher.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/gzip.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/lzjb.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/metaslab.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sha256.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_config.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_errlog.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_history.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/space_map.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/bplist.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dbuf.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_objset.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_traverse.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_tx.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dmu_zfetch.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dnode.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dataset.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_dir.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_pool.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_prop.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/dsl_synctask.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/metaslab_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/spa_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/space_map.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/txg_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/uberblock_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/unique.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_disk.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_file.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/vdev_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zap_leaf.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_acl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_context.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ctldir.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_debug.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_dir.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_ioctl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_rlock.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_vfsops.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zil_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_checksum.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_compress.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zio_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zvol.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/txg.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/uberblock.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/unique.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_disk.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_file.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_label.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_mirror.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_missing.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_raidz.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/vdev_root.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_leaf.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zap_micro.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs.conf#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_acl.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_byteswap.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ctldir.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_dir.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_fm.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_log.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_rlock.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zil.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_checksum.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_compress.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio_inject.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zvol.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/os/callb.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/os/list.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/os/nvpair_alloc_system.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/os/taskq.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_array.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/rpc/xdr_mem.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/avl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/avl_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/bitmap.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/byteorder.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/callb.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/ccompile.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/compress.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/cred.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/dkio.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/dklabel.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/errorq.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/feature_tests.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/fm/fs/zfs.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/fm/protocol.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/fm/util.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/fs/zfs.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/gfs.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/list.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/list_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/note.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/nvpair_impl.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/processor.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/procset.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/synch.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/sysevent.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/sysmacros.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/sys/zmod.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/adler32.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/crc32.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/deflate.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/inffast.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/inffixed.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/inflate.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/inftrees.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/trees.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/zconf.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/zlib.h#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/zmod_subr.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.c#1 branch
.. //depot/projects/bdb/sys/cddl/contrib/opensolaris/uts/common/zmod/zutil.h#1 branch
.. //depot/projects/bdb/sys/compat/freebsd32/freebsd32_misc.c#2 integrate
.. //depot/projects/bdb/sys/compat/freebsd32/freebsd32_proto.h#3 integrate
.. //depot/projects/bdb/sys/compat/freebsd32/freebsd32_syscall.h#3 integrate
.. //depot/projects/bdb/sys/compat/freebsd32/freebsd32_syscalls.c#3 integrate
.. //depot/projects/bdb/sys/compat/freebsd32/freebsd32_sysent.c#3 integrate
.. //depot/projects/bdb/sys/compat/freebsd32/syscalls.master#3 integrate
.. //depot/projects/bdb/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/bdb/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/bdb/sys/compat/linux/linux_file.h#1 branch
.. //depot/projects/bdb/sys/compat/linux/linux_futex.c#2 integrate
.. //depot/projects/bdb/sys/compat/linux/linux_futex.h#2 integrate
.. //depot/projects/bdb/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/bdb/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/bdb/sys/compat/linux/linux_uid16.c#2 integrate
.. //depot/projects/bdb/sys/compat/linux/linux_util.c#2 integrate
.. //depot/projects/bdb/sys/compat/linux/linux_util.h#2 integrate
.. //depot/projects/bdb/sys/compat/opensolaris/kern/opensolaris_atomic.c#2 delete
.. //depot/projects/bdb/sys/compat/opensolaris/kern/opensolaris_kmem.c#2 delete
.. //depot/projects/bdb/sys/compat/opensolaris/kern/opensolaris_kobj.c#2 delete
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 21:27:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5C5031065672; Tue, 22 Apr 2008 21:27:13 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1EC31106566C
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 21:27:13 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 159128FC16
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 21:27:13 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MLRCsD011236
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 21:27:12 GMT
(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MLRCsw011234
for perforce@freebsd.org; Tue, 22 Apr 2008 21:27:12 GMT
(envelope-from gonzo@FreeBSD.org)
Date: Tue, 22 Apr 2008 21:27:12 GMT
Message-Id: <200804222127.m3MLRCsw011234@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140426 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 21:27:13 -0000
http://perforce.freebsd.org/chv.cgi?CH=140426
Change 140426 by gonzo@gonzo_jeeves on 2008/04/22 21:26:19
o Remove noisy printf's from mask/unmas functions
o Add new parameter (irq) to intr_event_create call
o Use intr_event_handle instead of handmade loop
Affected files ...
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#10 edit
Differences ...
==== //depot/projects/mips2-jnpr/src/sys/mips/mips/intr_machdep.c#10 (text+ko) ====
@@ -57,14 +57,12 @@
mips_mask_irq(void)
{
- printf("Unimplemented: %s\n", __func__);
}
void
mips_unmask_irq(void)
{
- printf("Unimplemented: %s\n", __func__);
}
void
@@ -84,9 +82,9 @@
event = hardintr_events[irq];
if (event == NULL) {
- error = intr_event_create(&event, (void *)irq, 0,
+ error = intr_event_create(&event, (void *)irq, 0, irq,
(mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq,
- (mask_fn)mips_unmask_irq, NULL, "hard intr%d:", irq);
+ NULL, NULL, "hard intr%d:", irq);
if (error)
return;
hardintr_events[irq] = event;
@@ -122,9 +120,9 @@
event = softintr_events[irq];
if (event == NULL) {
- error = intr_event_create(&event, (void *)irq, 0,
+ error = intr_event_create(&event, (void *)irq, 0, irq,
(mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq,
- (mask_fn)mips_unmask_irq, NULL, "intr%d:", irq);
+ NULL, NULL, "intr%d:", irq);
if (error)
return;
softintr_events[irq] = event;
@@ -139,13 +137,11 @@
void
cpu_intr(struct trapframe *tf)
{
- struct intr_handler *ih;
struct intr_event *event;
register_t cause;
int hard;
int intr;
int i;
- int thread;
critical_enter();
@@ -171,26 +167,16 @@
break;
}
- if (!event || TAILQ_EMPTY(&event->ie_handlers))
- {
- printf("stray %s interrupt %d\n",
- hard ? "hard" : "soft", i);
- continue;
+ if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ printf("stray %s interrupt %d\n",
+ hard ? "hard" : "soft", i);
+ continue;
}
- /* Execute fast handlers. */
- thread = 0;
- TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) {
- if (ih->ih_filter == NULL)
- thread = 1;
- else
- ih->ih_filter(ih->ih_argument ?
- ih->ih_argument : tf);
+ if (intr_event_handle(event, tf) != 0) {
+ printf("stray %s interrupt %d\n",
+ hard ? "hard" : "soft", i);
}
-
- /* Schedule thread if needed. */
- if (thread)
- intr_event_schedule_thread(event);
}
KASSERT(i == 0, ("all interrupts handled"));
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 21:52:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4A00D1065670; Tue, 22 Apr 2008 21:52:40 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0C6F6106566B
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 21:52:40 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 050AA8FC14
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 21:52:40 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MLqdQW011978
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 21:52:39 GMT
(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MLqdut011976
for perforce@freebsd.org; Tue, 22 Apr 2008 21:52:39 GMT
(envelope-from gonzo@FreeBSD.org)
Date: Tue, 22 Apr 2008 21:52:39 GMT
Message-Id: <200804222152.m3MLqdut011976@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140428 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 21:52:40 -0000
http://perforce.freebsd.org/chv.cgi?CH=140428
Change 140428 by gonzo@gonzo_jeeves on 2008/04/22 21:51:57
o Use intr_event_handle instead of handmade loop
o Add new parameter (irq) to intr_event_create call
o Merge patch submitted by Zhao, Ning a while ago
(obtained from NetBSD): fixes messes with PIC_OCW1/PIC_OCW3
Affected files ...
.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt_pci.c#5 edit
Differences ...
==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/malta/gt_pci.c#5 (text+ko) ====
@@ -142,17 +142,14 @@
{
struct gt_pci_softc *sc = v;
struct intr_event *event;
- struct intr_handler *ih;
- int irq, thread;
+ int irq;
for (;;) {
bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, PIC_OCW3,
OCW3_SEL | OCW3_P);
irq = bus_space_read_1(sc->sc_pciio, sc->sc_ioh_icu1, PIC_OCW3);
if ((irq & OCW3_POLL_PENDING) == 0)
- {
return FILTER_HANDLED;
- }
irq = OCW3_POLL_IRQ(irq);
@@ -168,22 +165,14 @@
}
event = sc->sc_eventstab[irq];
- thread = 0;
- if (event && !TAILQ_EMPTY(&event->ie_handlers))
- {
- /* Execute fast handlers. */
- TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) {
- if (ih->ih_filter == NULL)
- thread = 1;
- else
- ih->ih_filter(ih->ih_argument);
- }
+ if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
+ printf("gt_pci: stray interrupt %d\n", irq);
+ continue;
}
- /* Schedule thread if needed. */
- if (thread)
- intr_event_schedule_thread(event);
+ if (intr_event_handle(event, NULL) != 0)
+ printf("gt_pci: stray interrupt %d\n", irq);
/* Send a specific EOI to the 8259. */
if (irq > 7) {
@@ -285,15 +274,15 @@
ICW4_8086);
/* mask all interrupts */
- bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, 0,
+ bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, 1,
sc->sc_imask & 0xff);
/* enable special mask mode */
- bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, 1,
+ bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, 0,
OCW3_SEL | OCW3_ESMM | OCW3_SMM);
/* read IRR by default */
- bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, 1,
+ bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu1, 0,
OCW3_SEL | OCW3_RR);
/* reset, program device, 4 bytes */
@@ -307,15 +296,15 @@
ICW4_8086);
/* mask all interrupts */
- bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu2, 0,
+ bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu2, 1,
sc->sc_imask & 0xff);
/* enable special mask mode */
- bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu2, 1,
+ bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu2, 0,
OCW3_SEL | OCW3_ESMM | OCW3_SMM);
/* read IRR by default */
- bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu2, 1,
+ bus_space_write_1(sc->sc_pciio, sc->sc_ioh_icu2, 0,
OCW3_SEL | OCW3_RR);
/*
@@ -657,9 +646,9 @@
event = sc->sc_eventstab[irq];
if (event == NULL) {
- error = intr_event_create(&event, (void *)irq, 0,
+ error = intr_event_create(&event, (void *)irq, 0, irq,
(mask_fn)mips_mask_irq, (mask_fn)mips_unmask_irq,
- (mask_fn)mips_unmask_irq, NULL, "gt_pci intr%d:", irq);
+ NULL, NULL, "gt_pci intr%d:", irq);
if (error)
return 0;
sc->sc_eventstab[irq] = event;
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 21:53:41 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 815291065674; Tue, 22 Apr 2008 21:53:41 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 43FE71065672
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 21:53:41 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 3CFC98FC15
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 21:53:41 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MLrfpg011997
for <perforce@FreeBSD.org>; Tue, 22 Apr 2008 21:53:41 GMT
(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MLrfBK011995
for perforce@freebsd.org; Tue, 22 Apr 2008 21:53:41 GMT
(envelope-from gonzo@FreeBSD.org)
Date: Tue, 22 Apr 2008 21:53:41 GMT
Message-Id: <200804222153.m3MLrfBK011995@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140429 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 21:53:41 -0000
http://perforce.freebsd.org/chv.cgi?CH=140429
Change 140429 by gonzo@gonzo_jeeves on 2008/04/22 21:52:58
o Minor cleanups
o Add new parameter (irq) to intr_event_create call
o Use intr_event_handle instead of handmade loop
Affected files ...
.. //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/obio.c#5 edit
Differences ...
==== //depot/projects/mips2-jnpr/src/sys/mips/mips32/idt/obio.c#5 (text+ko) ====
@@ -273,7 +273,7 @@
event = sc->sc_eventstab[irq];
if (event == NULL) {
- error = intr_event_create(&event, (void *)irq, 0,
+ error = intr_event_create(&event, (void *)irq, 0, irq,
(mask_fn)obio_mask_irq, (mask_fn)obio_unmask_irq,
NULL, NULL,
"obio intr%d:", irq);
@@ -328,9 +328,8 @@
{
struct obio_softc *sc = arg;
struct intr_event *event;
- struct intr_handler *ih;
uint32_t irqstat, ipend, imask, xpend;
- int irq, thread, group, i, ret;
+ int irq, thread, group, i;
irqstat = 0;
irq = 0;
@@ -350,68 +349,15 @@
irq = IP_IRQ(group, i - 1);
event = sc->sc_eventstab[irq];
thread = 0;
-#ifndef INTR_FILTER
- obio_mask_irq(irq);
-#endif
if (!event || TAILQ_EMPTY(&event->ie_handlers)) {
-#ifdef INTR_FILTER
- obio_unmask_irq(irq);
-#endif
+ printf("obio: stray irq %d\n", irq);
continue;
}
-#ifdef INTR_FILTER
/* TODO: frame instead of NULL? */
- intr_event_handle(event, NULL);
- /* XXX: Log stray IRQs */
-#else
- /* Execute fast handlers. */
- TAILQ_FOREACH(ih, &event->ie_handlers,
- ih_next) {
- if (ih->ih_filter == NULL)
- thread = 1;
- else
- ret = ih->ih_filter(ih->ih_argument);
- /*
- * Wrapper handler special case: see
- * intr_execute_handlers() in
- * i386/intr_machdep.c
- */
- if (!thread) {
- if (ret == FILTER_SCHEDULE_THREAD)
- thread = 1;
- }
- }
-
- /* Schedule thread if needed. */
- if (thread)
- intr_event_schedule_thread(event);
- else
- obio_unmask_irq(irq);
- }
- }
-#endif
-#if 0
- ipend = ICU_REG_READ(ICU_IPEND2);
- printf("ipend2 = %08x!\n", ipend);
-
- ipend = ICU_REG_READ(ICU_IPEND3);
- printf("ipend3 = %08x!\n", ipend);
-
- ipend = ICU_REG_READ(ICU_IPEND4);
- printf("ipend4 = %08x!\n", ipend);
- ipend = ICU_REG_READ(ICU_IPEND5);
- printf("ipend5 = %08x!\n", ipend);
-
- ipend = ICU_REG_READ(ICU_IPEND6);
- printf("ipend6 = %08x!\n", ipend);
-#endif
- while (irqstat != 0) {
- if ((irqstat & 1) == 1) {
+ if (intr_event_handle(event, NULL) != 0)
+ printf("obio: stray irq %d\n", irq);
}
-
- irq++;
- irqstat >>= 1;
}
return (FILTER_HANDLED);
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 22:26:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 300FE1065672; Tue, 22 Apr 2008 22:26:17 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id E60DF1065670
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:26:16 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id E011C8FC1F
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:26:16 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MMQGNI014368
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:26:16 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MMQG7e014366
for perforce@freebsd.org; Tue, 22 Apr 2008 22:26:16 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 22:26:16 GMT
Message-Id: <200804222226.m3MMQG7e014366@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140430 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 22:26:17 -0000
http://perforce.freebsd.org/chv.cgi?CH=140430
Change 140430 by jb@freebsd3 on 2008/04/22 22:25:50
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#70 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#42 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#34 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgj.key#1 branch
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#34 integrate
.. //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#33 integrate
.. //depot/projects/dtrace/ports/MOVED#79 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/libintl.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/include/zone.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 integrate
.. //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mkdirp.c#2 integrate
.. //depot/projects/dtrace/src/etc/rc.d/initrandom#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdio/fopen.c#6 integrate
.. //depot/projects/dtrace/src/release/amd64/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/i386/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/ia64/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/pc98/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/picobsd/bridge/crunch.conf#6 integrate
.. //depot/projects/dtrace/src/release/powerpc/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/sparc64/boot_crunch.conf#5 integrate
.. //depot/projects/dtrace/src/release/sun4v/boot_crunch.conf#3 integrate
.. //depot/projects/dtrace/src/share/misc/committers-doc.dot#4 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#27 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/clock.h#10 integrate
.. //depot/projects/dtrace/src/sys/amd64/isa/clock.c#12 integrate
.. //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_ost.c#6 integrate
.. //depot/projects/dtrace/src/sys/i386/bios/apm.c#8 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#27 integrate
.. //depot/projects/dtrace/src/sys/i386/include/clock.h#10 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/clock.c#15 integrate
.. //depot/projects/dtrace/src/sys/i386/isa/pmtimer.c#5 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/clock.c#9 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#20 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_clock.c#8 integrate
.. //depot/projects/dtrace/src/sys/kern/subr_rtc.c#4 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_mount.c#31 integrate
.. //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#17 integrate
.. //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#19 integrate
.. //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#10 integrate
.. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#22 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#5 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/powerpc/booke/clock.c#4 integrate
.. //depot/projects/dtrace/src/sys/sys/clock.h#6 integrate
.. //depot/projects/dtrace/src/sys/sys/time.h#16 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/inode.h#7 integrate
.. //depot/projects/dtrace/src/sys/ufs/ufs/ufs_lookup.c#11 integrate
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.freebsd#19 integrate
.. //depot/projects/dtrace/www/en/developers.sgml#33 integrate
.. //depot/projects/dtrace/www/en/projects/Makefile#7 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode-2008.sgml#1 branch
.. //depot/projects/dtrace/www/en/projects/summerofcode.xsl#6 integrate
.. //depot/projects/dtrace/www/share/sgml/news.xml#46 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#70 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.785 2008/04/16 08:32:58 jadawin Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.786 2008/04/22 15:26:14 pgj Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -3079,11 +3079,6 @@
</listitem>
<listitem>
- <para>Gábor Páli
- <email>pali.gabor@gmail.com</email></para>
- </listitem>
-
- <listitem>
<para>Gábor Zahemszky
<email>zgabor@CoDe.hu</email></para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml#42 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.223 2008/03/14 11:15:47 rdivacky Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.committers.sgml,v 1.224 2008/04/22 15:26:14 pgj Exp $ -->
<!--
NOTE TO NEW COMMITTERS: Core and committers lists are sorted in
alphabetical order by last name. Please keep in mind that fact while
@@ -958,6 +958,10 @@
</listitem>
<listitem>
+ <para>&a.pgj;</para>
+ </listitem>
+
+ <listitem>
<para>&a.hmp;</para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/share/sgml/authors.ent#34 (text+ko) ====
@@ -13,7 +13,7 @@
builds for the other languages, and we will poke fun of you
in public.
- $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.444 2008/03/13 17:10:48 rdivacky Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/share/sgml/authors.ent,v 1.445 2008/04/22 15:26:14 pgj Exp $
-->
<!ENTITY a.aaron "Aaron Dalton <email>aaron@FreeBSD.org</email>">
@@ -812,6 +812,8 @@
<!ENTITY a.peter "Peter Wemm <email>peter@FreeBSD.org</email>">
+<!ENTITY a.pgj "Gábor Páli <email>pgj@FreeBSD.org</email>">
+
<!ENTITY a.phantom "Alexey Zelkin <email>phantom@FreeBSD.org</email>">
<!ENTITY a.philip "Philip Paeps <email>philip@FreeBSD.org</email>">
==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys-developers.sgml#34 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.67 2008/03/14 16:38:22 rdivacky Exp $
+ $FreeBSD: doc/share/pgpkeys/pgpkeys-developers.sgml,v 1.68 2008/04/22 15:26:14 pgj Exp $
-->
<sect2 id="pgpkey-ariff">
@@ -799,6 +799,11 @@
&pgpkey.philip;
</sect2>
+ <sect2 id="pgpkey-pgj">
+ <title>&a.pgj;</title>
+ &pgpkey.pgj;
+ </sect2>
+
<sect2 id="pgpkey-hmp">
<title>&a.hmp;</title>
&pgpkey.hmp;
==== //depot/projects/dtrace/doc/share/pgpkeys/pgpkeys.ent#33 (text+ko) ====
@@ -1,5 +1,5 @@
-<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.164 2008/03/14 16:38:22 rdivacky Exp $ -->
+<!-- $FreeBSD: doc/share/pgpkeys/pgpkeys.ent,v 1.165 2008/04/22 15:26:14 pgj Exp $ -->
<!-- PGP keyblocks -->
<!ENTITY pgpkey.aaron SYSTEM "aaron.key">
<!ENTITY pgpkey.ache SYSTEM "ache.key">
@@ -209,6 +209,7 @@
<!ENTITY pgpkey.perky SYSTEM "perky.key">
<!ENTITY pgpkey.petef SYSTEM "petef.key">
<!ENTITY pgpkey.peter SYSTEM "peter.key">
+<!ENTITY pgpkey.pgj SYSTEM "pgj.key">
<!ENTITY pgpkey.phantom SYSTEM "phantom.key">
<!ENTITY pgpkey.philip SYSTEM "philip.key">
<!ENTITY pgpkey.phk SYSTEM "phk.key">
==== //depot/projects/dtrace/ports/MOVED#79 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1576 2008/04/20 22:40:34 pav Exp $
+# $FreeBSD: ports/MOVED,v 1.1577 2008/04/22 21:11:12 ehaupt Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3453,3 +3453,4 @@
games/teewars|games/teeworls|2008-04-17|Project renamed
multimedia/exportvideo||2008-04-21|Add-on for soon to be removed nuppelvideo port
multimedia/nuppelvideo||2008-04-21|Unmaintained upstream for years. The nuppelvideo format is now supported by mencoder
+graphics/ascii0|graphics/asciio|2008-04-22|renamed by delete+add
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/devid.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.4 2008/04/22 07:42:58 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/libintl.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _LIBINTL_H_
#define _LIBINTL_H_
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/mnttab.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _OPENSOLARIS_MNTTAB_H_
#define _OPENSOLARIS_MNTTAB_H_
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/priv.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _OPENSOLARIS_PRIV_H_
#define _OPENSOLARIS_PRIV_H_
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/solaris.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _SOLARIS_H_
#define _SOLARIS_H_
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/include/zone.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _ZONE_H_
#define _ZONE_H_
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.c#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Ricardo Correia. All rights reserved.
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/lib/libumem/umem.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace/src/cddl/compat/opensolaris/misc/mkdirp.c#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/* Copyright (c) 1988 AT&T */
==== //depot/projects/dtrace/src/etc/rc.d/initrandom#5 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/initrandom,v 1.7 2007/05/24 05:58:20 rse Exp $
+# $FreeBSD: src/etc/rc.d/initrandom,v 1.8 2008/04/22 15:18:47 ru Exp $
#
# PROVIDE: initrandom
@@ -28,24 +28,26 @@
if [ \! -z "${soft_random_generator}" ] ; then
- if checkyesno harvest_interrupt; then
- if [ -w /dev/random ]; then
+ if [ -w /dev/random ]; then
+ if checkyesno harvest_interrupt; then
${SYSCTL_W} kern.random.sys.harvest.interrupt=1 >/dev/null
echo -n ' interrupts'
+ else
+ ${SYSCTL_W} kern.random.sys.harvest.interrupt=0 >/dev/null
fi
- fi
- if checkyesno harvest_ethernet; then
- if [ -w /dev/random ]; then
+ if checkyesno harvest_ethernet; then
${SYSCTL_W} kern.random.sys.harvest.ethernet=1 >/dev/null
echo -n ' ethernet'
+ else
+ ${SYSCTL_W} kern.random.sys.harvest.ethernet=0 >/dev/null
fi
- fi
- if checkyesno harvest_p_to_p; then
- if [ -w /dev/random ]; then
- ${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
+ if checkyesno harvest_p_to_p; then
+ ${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
echo -n ' point_to_point'
+ else
+ ${SYSCTL_W} kern.random.sys.harvest.point_to_point=0 >/dev/null
fi
fi
==== //depot/projects/dtrace/src/lib/libc/stdio/fopen.c#6 (text+ko) ====
@@ -34,7 +34,7 @@
static char sccsid[] = "@(#)fopen.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.13 2008/02/27 21:25:19 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.14 2008/04/22 17:03:32 jhb Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -73,6 +73,7 @@
* open.
*/
if (f > SHRT_MAX) {
+ fp->_flags = 0; /* release */
_close(f);
errno = EMFILE;
return (NULL);
==== //depot/projects/dtrace/src/release/amd64/boot_crunch.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.62 2008/01/22 16:35:08 kensmith Exp $
+# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.63 2008/04/22 18:20:03 thompsa Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -44,3 +44,4 @@
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
+libs -lbsdxml
==== //depot/projects/dtrace/src/release/i386/boot_crunch.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.62 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/i386/boot_crunch.conf,v 1.63 2008/04/22 18:20:04 thompsa Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -44,3 +44,4 @@
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
+libs -lbsdxml
==== //depot/projects/dtrace/src/release/ia64/boot_crunch.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.12 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/ia64/boot_crunch.conf,v 1.13 2008/04/22 18:20:04 thompsa Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -46,3 +46,4 @@
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs -ldevinfo
+libs -lbsdxml
==== //depot/projects/dtrace/src/release/pc98/boot_crunch.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.63 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/pc98/boot_crunch.conf,v 1.64 2008/04/22 18:20:04 thompsa Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -42,4 +42,4 @@
progs sysinstall
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
+libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
==== //depot/projects/dtrace/src/release/picobsd/bridge/crunch.conf#6 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.22 2007/11/14 05:42:53 luigi Exp $
+# $FreeBSD: src/release/picobsd/bridge/crunch.conf,v 1.23 2008/04/22 18:20:05 thompsa Exp $
#
# configuration file for "bridge" floppy.
# Depending on your needs, almost surely you will need to
@@ -181,3 +181,4 @@
libs -lz -lpcap -lwrap
libs -ltermcap -lgnuregex # -lcurses
libs -lgeom
+libs -lbsdxml # used by ifconfig
==== //depot/projects/dtrace/src/release/powerpc/boot_crunch.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.5 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/powerpc/boot_crunch.conf,v 1.6 2008/04/22 18:20:05 thompsa Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -46,3 +46,4 @@
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lkiconv -lsbuf -lufs
+libs -lbsdxml
==== //depot/projects/dtrace/src/release/sparc64/boot_crunch.conf#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.9 2008/01/22 16:35:09 kensmith Exp $
+# $FreeBSD: src/release/sparc64/boot_crunch.conf,v 1.10 2008/04/22 18:20:05 thompsa Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -43,4 +43,4 @@
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
+libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
==== //depot/projects/dtrace/src/release/sun4v/boot_crunch.conf#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/sun4v/boot_crunch.conf,v 1.2 2008/01/22 16:35:10 kensmith Exp $
+# $FreeBSD: src/release/sun4v/boot_crunch.conf,v 1.3 2008/04/22 18:20:05 thompsa Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -43,4 +43,4 @@
progs usbdevs
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
-libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs
+libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -lbsdxml
==== //depot/projects/dtrace/src/share/misc/committers-doc.dot#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/misc/committers-doc.dot,v 1.21 2008/02/27 07:37:24 ganbold Exp $
+# $FreeBSD: src/share/misc/committers-doc.dot,v 1.22 2008/04/22 15:42:20 pgj Exp $
# This file is meant to list all FreeBSD doc+www committers and describe the
# mentor-mentee relationships between them.
@@ -62,6 +62,7 @@
murray [label="Murray Stokely\nmurray@FreeBSD.org\n2000/04/05"]
nik [label="Nik Clayton\nnik@FreeBSD.org\n1998/02/26"]
pav [label="Pav Lucistnik\npav@FreeBSD.org\n2005/08/12"]
+pgj [label="Gabor Pali\npgj@FreeBSD.org\n2008/04/21"]
remko [label="Remko Lodder\nremko@FreeBSD.org\n2004/10/16"]
roam [label="Peter Pentchev\nroam@FreeBSD.org\n2003/02/14"]
simon [label="Simon L. Nielsen\nsimon@FreeBSD.org\n2003/07/20"]
@@ -86,6 +87,8 @@
delphij -> chinsan
delphij -> loader
+gabor -> pgj
+
jesusr -> jcamou
jim -> trhodes
==== //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#27 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.684 2008/04/19 07:25:57 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -61,7 +61,6 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
==== //depot/projects/dtrace/src/sys/amd64/include/clock.h#10 (text+ko) ====
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.60 2008/04/22 19:38:27 phk Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -27,6 +27,7 @@
* Driver to clock driver interface.
*/
+void startrtclock(void);
void init_TSC(void);
void init_TSC_tc(void);
==== //depot/projects/dtrace/src/sys/amd64/isa/clock.c#12 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.243 2008/04/22 19:38:27 phk Exp $");
/*
* Routines to handle clock hardware.
@@ -45,7 +45,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
==== //depot/projects/dtrace/src/sys/arm/sa11x0/sa11x0_ost.c#6 (text+ko) ====
@@ -38,14 +38,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.8 2008/04/22 19:38:27 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/time.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/module.h>
#include <machine/bus.h>
==== //depot/projects/dtrace/src/sys/i386/bios/apm.c#8 (text+ko) ====
@@ -17,12 +17,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.150 2007/12/06 01:39:23 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.151 2008/04/22 19:38:27 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/conf.h>
#include <sys/condvar.h>
#include <sys/eventhandler.h>
==== //depot/projects/dtrace/src/sys/i386/i386/machdep.c#27 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.668 2008/03/16 10:58:03 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.669 2008/04/22 19:38:27 phk Exp $");
#include "opt_apic.h"
#include "opt_atalk.h"
@@ -62,7 +62,6 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
==== //depot/projects/dtrace/src/sys/i386/include/clock.h#10 (text+ko) ====
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $FreeBSD: src/sys/i386/include/clock.h,v 1.61 2008/04/14 08:00:00 phk Exp $
+ * $FreeBSD: src/sys/i386/include/clock.h,v 1.62 2008/04/22 19:38:28 phk Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -27,6 +27,7 @@
* Driver to clock driver interface.
*/
+void startrtclock(void);
void timer_restore(void);
void init_TSC(void);
void init_TSC_tc(void);
==== //depot/projects/dtrace/src/sys/i386/isa/clock.c#15 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.247 2008/04/14 08:00:00 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.248 2008/04/22 19:38:28 phk Exp $");
/*
* Routines to handle clock hardware.
@@ -49,7 +49,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
==== //depot/projects/dtrace/src/sys/i386/isa/pmtimer.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/pmtimer.c,v 1.6 2006/10/02 12:59:57 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/pmtimer.c,v 1.7 2008/04/22 19:38:28 phk Exp $");
/*
* Timer device driver for power management events.
@@ -35,7 +35,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/kernel.h>
#include <sys/module.h>
#include <sys/syslog.h>
==== //depot/projects/dtrace/src/sys/ia64/ia64/clock.c#9 (text+ko) ====
@@ -25,16 +25,14 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.33 2008/04/15 17:02:23 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.34 2008/04/22 19:38:28 phk Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/clock.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/timetc.h>
#include <sys/pcpu.h>
==== //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#20 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.236 2008/04/15 05:02:42 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.237 2008/04/22 19:38:28 phk Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -261,7 +261,6 @@
*/
identifycpu();
- /* startrtclock(); */
#ifdef PERFMON
perfmon_init();
#endif
==== //depot/projects/dtrace/src/sys/kern/subr_clock.c#8 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_clock.c,v 1.14 2008/04/12 21:51:54 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_clock.c,v 1.15 2008/04/22 19:38:28 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,18 +52,14 @@
#define ct_debug bootverbose
static int adjkerntz; /* local offset from GMT in seconds */
static int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
-int disable_rtc_set; /* disable resettodr() if != 0 */
int tz_minuteswest;
int tz_dsttime;
/*
- * These have traditionally been in machdep, but should probably be moved to
+ * This have traditionally been in machdep, but should probably be moved to
* kern.
*/
-SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
- CTLFLAG_RW, &disable_rtc_set, 0, "");
-
SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock,
CTLFLAG_RW, &wall_cmos_clock, 0, "");
@@ -71,8 +67,7 @@
sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS)
{
int error;
- error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2,
- req);
+ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
if (!error && req->newptr)
resettodr();
return (error);
==== //depot/projects/dtrace/src/sys/kern/subr_rtc.c#4 (text+ko) ====
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_rtc.c,v 1.9 2006/10/02 18:23:37 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_rtc.c,v 1.10 2008/04/22 19:38:28 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,6 +63,11 @@
static device_t clock_dev = NULL;
static long clock_res;
+/* XXX: should be kern. now, it's no longer machdep. */
+static int disable_rtc_set;
+SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
+ CTLFLAG_RW, &disable_rtc_set, 0, "");
+
void
clock_register(device_t dev, long res) /* res has units of microseconds */
{
@@ -118,6 +123,7 @@
"will not be set accurately\n");
return;
}
+ /* XXX: We should poll all registered RTCs in case of failure */
error = CLOCK_GETTIME(clock_dev, &ts);
if (error != 0 && error != EINVAL) {
printf("warning: clock_gettime failed (%d), the system time "
@@ -158,6 +164,7 @@
getnanotime(&ts);
ts.tv_sec -= utc_offset();
+ /* XXX: We should really set all registered RTCs */
if ((error = CLOCK_SETTIME(clock_dev, &ts)) != 0) {
printf("warning: clock_settime failed (%d), time-of-day clock "
"not adjusted to system time\n", error);
==== //depot/projects/dtrace/src/sys/kern/vfs_mount.c#31 (text+ko) ====
@@ -35,11 +35,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.279 2008/04/08 17:53:33 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.280 2008/04/22 19:38:28 phk Exp $");
#include <sys/param.h>
#include <sys/conf.h>
-#include <sys/clock.h>
#include <sys/fcntl.h>
#include <sys/jail.h>
#include <sys/kernel.h>
==== //depot/projects/dtrace/src/sys/netinet6/udp6_usrreq.c#17 (text+ko) ====
@@ -63,7 +63,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.86 2008/04/17 21:38:17 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet6/udp6_usrreq.c,v 1.87 2008/04/22 12:20:33 rwatson Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -129,7 +129,7 @@
struct socket *so;
struct mbuf *opts;
- INP_WLOCK_ASSERT(inp);
+ INP_LOCK_ASSERT(inp);
#ifdef IPSEC
/* Check AH/ESP integrity. */
@@ -277,9 +277,9 @@
struct mbuf *n;
if ((n = m_copy(m, 0, M_COPYALL)) != NULL) {
- INP_WLOCK(last);
+ INP_RLOCK(last);
udp6_append(last, n, off, &fromsa);
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
}
}
last = inp;
@@ -306,9 +306,9 @@
udpstat.udps_noportmcast++;
goto badheadlocked;
}
- INP_WLOCK(last);
+ INP_RLOCK(last);
udp6_append(last, m, off, &fromsa);
- INP_WUNLOCK(last);
+ INP_RUNLOCK(last);
INP_INFO_RUNLOCK(&udbinfo);
return (IPPROTO_DONE);
}
@@ -343,9 +343,9 @@
icmp6_error(m, ICMP6_DST_UNREACH, ICMP6_DST_UNREACH_NOPORT, 0);
return (IPPROTO_DONE);
}
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
udp6_append(inp, m, off, &fromsa);
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
INP_INFO_RUNLOCK(&udbinfo);
return (IPPROTO_DONE);
@@ -453,7 +453,7 @@
INP_INFO_RUNLOCK(&udbinfo);
return (ENOENT);
}
- INP_WLOCK(inp);
+ INP_RLOCK(inp);
if (inp->inp_socket == NULL) {
error = ENOENT;
goto out;
@@ -463,7 +463,7 @@
goto out;
cru2x(inp->inp_socket->so_cred, &xuc);
out:
- INP_WUNLOCK(inp);
+ INP_RUNLOCK(inp);
INP_INFO_RUNLOCK(&udbinfo);
if (error == 0)
error = SYSCTL_OUT(req, &xuc, sizeof(struct xucred));
==== //depot/projects/dtrace/src/sys/nfsclient/nfs_vfsops.c#19 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.203 2008/03/22 09:15:15 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.204 2008/04/22 19:38:29 phk Exp $");
#include "opt_bootp.h"
@@ -44,7 +44,6 @@
#include <sys/kernel.h>
#include <sys/bio.h>
#include <sys/buf.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
==== //depot/projects/dtrace/src/sys/pc98/cbus/clock.c#10 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.168 2008/04/19 08:18:47 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.169 2008/04/22 19:38:29 phk Exp $");
/*
* Routines to handle clock hardware.
@@ -51,7 +51,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
==== //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#22 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.403 2008/03/16 10:58:08 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.404 2008/04/22 19:38:29 phk Exp $");
#include "opt_atalk.h"
#include "opt_compat.h"
@@ -60,7 +60,6 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
==== //depot/projects/dtrace/src/sys/powerpc/aim/clock.c#5 (text+ko) ====
@@ -56,14 +56,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.32 2008/04/21 04:41:37 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.33 2008/04/22 19:38:30 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/timetc.h>
#include <sys/interrupt.h>
==== //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#8 (text+ko) ====
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.112 2008/04/16 23:28:12 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.113 2008/04/22 19:38:30 phk Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -196,7 +196,6 @@
*/
cpu_setup(PCPU_GET(cpuid));
- /* startrtclock(); */
#ifdef PERFMON
perfmon_init();
#endif
==== //depot/projects/dtrace/src/sys/powerpc/booke/clock.c#4 (text+ko) ====
@@ -56,14 +56,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/booke/clock.c,v 1.3 2008/04/13 21:20:26 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/booke/clock.c,v 1.4 2008/04/22 19:38:30 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/timetc.h>
#include <sys/interrupt.h>
==== //depot/projects/dtrace/src/sys/sys/clock.h#6 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 22:37:30 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id D4F201065673; Tue, 22 Apr 2008 22:37:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 97099106566B
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:37:29 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 920238FC20
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:37:29 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MMbTIO014686
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:37:29 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MMbTiW014684
for perforce@freebsd.org; Tue, 22 Apr 2008 22:37:29 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 22:37:29 GMT
Message-Id: <200804222237.m3MMbTiW014684@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140431 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 22:37:30 -0000
http://perforce.freebsd.org/chv.cgi?CH=140431
Change 140431 by jb@freebsd3 on 2008/04/22 22:37:12
IF7
Affected files ...
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/devid.h#3 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/libintl.h#3 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/mnttab.h#3 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/priv.h#3 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/solaris.h#3 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/zone.h#3 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.c#3 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.h#3 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mkdirp.c#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/rpc/xdr.h#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/acl.h#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/byteorder.h#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/callb.h#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/dkio.h#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mntent.h#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq.h#3 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/acpi_support/acpi_asus.c#3 integrate
.. //depot/projects/dtrace7/src/sys/net/bpf.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_input.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_ipsec.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/tcp_var.h#4 integrate
Differences ...
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/devid.h#3 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.3.2.2 2008/04/22 09:21:27 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/libintl.h#3 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+
#ifndef _LIBINTL_H_
#define _LIBINTL_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/mnttab.h#3 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+
#ifndef _OPENSOLARIS_MNTTAB_H_
#define _OPENSOLARIS_MNTTAB_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/priv.h#3 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+
#ifndef _OPENSOLARIS_PRIV_H_
#define _OPENSOLARIS_PRIV_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/solaris.h#3 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+
#ifndef _SOLARIS_H_
#define _SOLARIS_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/zone.h#3 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+
#ifndef _ZONE_H_
#define _ZONE_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.c#3 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $
*/
/*
* Copyright 2006 Ricardo Correia. All rights reserved.
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.h#3 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mkdirp.c#3 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $
*/
/* Copyright (c) 1988 AT&T */
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#3 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c,v 1.3.2.2 2008/04/22 09:21:28 jb Exp $
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/rpc/xdr.h#3 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.3.2.2 2008/04/22 09:21:29 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/acl.h#3 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/acl.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/byteorder.h#3 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/byteorder.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
*/
/*
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/callb.h#3 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/callb.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/dkio.h#3 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dkio.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mntent.h#3 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mntent.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq.h#3 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#3 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq_impl.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/dev/acpi_support/acpi_asus.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.30.2.1 2008/04/14 16:50:55 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.30.2.2 2008/04/22 12:44:39 rpaulo Exp $");
/*
* Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on
@@ -375,6 +375,20 @@
{ .name = NULL }
};
+/*
+ * EeePC have an Asus ASUS010 gadget interface,
+ * but they can't be probed quite the same way as Asus laptops.
+ */
+static struct acpi_asus_model acpi_eeepc_models[] = {
+ {
+ .name = "EEE",
+ .brn_get = "\\_SB.ATKD.PBLG",
+ .brn_set = "\\_SB.ATKD.PBLS"
+ },
+
+ { .name = NULL }
+};
+
static struct {
char *name;
char *description;
@@ -444,13 +458,17 @@
ACPI_BUFFER Buf;
ACPI_OBJECT Arg, *Obj;
ACPI_OBJECT_LIST Args;
- static char *asus_ids[] = { "ATK0100", NULL };
+ static char *asus_ids[] = { "ATK0100", "ASUS010", NULL };
+ char *rstr;
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
- if (acpi_disabled("asus") ||
- ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids) == NULL)
+ if (acpi_disabled("asus"))
+ return (ENXIO);
+ rstr = ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids);
+ if (rstr == NULL) {
return (ENXIO);
+ }
sc = device_get_softc(dev);
sc->dev = dev;
@@ -489,6 +507,14 @@
AcpiOsFree(Buf.Pointer);
return (0);
}
+
+ /* if EeePC */
+ if (strncmp("ASUS010", rstr, 7) == 0) {
+ sc->model = &acpi_eeepc_models[0];
+ device_set_desc(dev, "ASUS EeePC");
+ AcpiOsFree(Buf.Pointer);
+ return (0);
+ }
}
sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
==== //depot/projects/dtrace7/src/sys/net/bpf.c#2 (text+ko) ====
@@ -33,7 +33,7 @@
*
* @(#)bpf.c 8.4 (Berkeley) 1/9/95
*
- * $FreeBSD: src/sys/net/bpf.c,v 1.181.2.1 2007/10/20 15:09:24 csjp Exp $
+ * $FreeBSD: src/sys/net/bpf.c,v 1.181.2.3 2008/04/22 15:53:07 jkim Exp $
*/
#include "opt_bpf.h"
@@ -85,8 +85,6 @@
#define PRINET 26 /* interruptible */
-#define M_SKIP_BPF M_SKIP_FIREWALL
-
/*
* bpf_iflist is a list of BPF interface structures, each corresponding to a
* specific DLT. The same network interface might have several BPF interface
@@ -644,9 +642,9 @@
mc = m_dup(m, M_DONTWAIT);
if (mc != NULL)
mc->m_pkthdr.rcvif = ifp;
- /* XXX Do not return the same packet twice. */
+ /* Set M_PROMISC for outgoing packets to be discarded. */
if (d->bd_direction == BPF_D_INOUT)
- m->m_flags |= M_SKIP_BPF;
+ m->m_flags |= M_PROMISC;
} else
mc = NULL;
@@ -1332,9 +1330,9 @@
}
}
-#define BPF_CHECK_DIRECTION(d, m) \
- if (((d)->bd_direction == BPF_D_IN && (m)->m_pkthdr.rcvif == NULL) || \
- ((d)->bd_direction == BPF_D_OUT && (m)->m_pkthdr.rcvif != NULL))
+#define BPF_CHECK_DIRECTION(d, i) \
+ (((d)->bd_direction == BPF_D_IN && (i) == NULL) || \
+ ((d)->bd_direction == BPF_D_OUT && (i) != NULL))
/*
* Incoming linkage from device drivers, when packet is in an mbuf chain.
@@ -1347,8 +1345,9 @@
int gottime;
struct timeval tv;
- if (m->m_flags & M_SKIP_BPF) {
- m->m_flags &= ~M_SKIP_BPF;
+ /* Skip outgoing duplicate packets. */
+ if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) {
+ m->m_flags &= ~M_PROMISC;
return;
}
@@ -1358,7 +1357,7 @@
BPFIF_LOCK(bp);
LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
- BPF_CHECK_DIRECTION(d, m)
+ if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif))
continue;
BPFD_LOCK(d);
++d->bd_rcount;
@@ -1401,8 +1400,9 @@
int gottime;
struct timeval tv;
- if (m->m_flags & M_SKIP_BPF) {
- m->m_flags &= ~M_SKIP_BPF;
+ /* Skip outgoing duplicate packets. */
+ if ((m->m_flags & M_PROMISC) != 0 && m->m_pkthdr.rcvif == NULL) {
+ m->m_flags &= ~M_PROMISC;
return;
}
@@ -1421,7 +1421,7 @@
BPFIF_LOCK(bp);
LIST_FOREACH(d, &bp->bif_dlist, bd_next) {
- BPF_CHECK_DIRECTION(d, m)
+ if (BPF_CHECK_DIRECTION(d, m->m_pkthdr.rcvif))
continue;
BPFD_LOCK(d);
++d->bd_rcount;
==== //depot/projects/dtrace7/src/sys/netinet/ip_input.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.332.2.1 2007/12/19 08:10:30 guido Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_input.c,v 1.332.2.2 2008/04/22 12:02:55 bz Exp $");
#include "opt_bootp.h"
#include "opt_ipfw.h"
@@ -1249,6 +1249,7 @@
struct in_ifaddr *ia = NULL;
struct mbuf *mcopy;
struct in_addr dest;
+ struct route ro;
int error, type = 0, code = 0, mtu = 0;
if (m->m_flags & (M_BCAST|M_MCAST) || in_canforward(ip->ip_dst) == 0) {
@@ -1326,7 +1327,6 @@
dest.s_addr = 0;
if (!srcrt && ipsendredirects && ia->ia_ifp == m->m_pkthdr.rcvif) {
struct sockaddr_in *sin;
- struct route ro;
struct rtentry *rt;
bzero(&ro, sizeof(ro));
@@ -1358,7 +1358,20 @@
RTFREE(rt);
}
- error = ip_output(m, NULL, NULL, IP_FORWARDING, NULL, NULL);
+ /*
+ * Try to cache the route MTU from ip_output so we can consider it for
+ * the ICMP_UNREACH_NEEDFRAG "Next-Hop MTU" field described in RFC1191.
+ */
+ bzero(&ro, sizeof(ro));
+ rtalloc_ign(&ro, RTF_CLONING);
+
+ error = ip_output(m, NULL, &ro, IP_FORWARDING, NULL, NULL);
+
+ if (error == EMSGSIZE && ro.ro_rt)
+ mtu = ro.ro_rt->rt_rmx.rmx_mtu;
+ if (ro.ro_rt)
+ RTFREE(ro.ro_rt);
+
if (error)
ipstat.ips_cantforward++;
else {
@@ -1394,14 +1407,23 @@
code = ICMP_UNREACH_NEEDFRAG;
#ifdef IPSEC
- mtu = ip_ipsec_mtu(m);
+ /*
+ * If IPsec is configured for this path,
+ * override any possibly mtu value set by ip_output.
+ */
+ mtu = ip_ipsec_mtu(m, mtu);
#endif /* IPSEC */
/*
+ * If the MTU was set before make sure we are below the
+ * interface MTU.
* If the MTU wasn't set before use the interface mtu or
* fall back to the next smaller mtu step compared to the
* current packet size.
*/
- if (mtu == 0) {
+ if (mtu != 0) {
+ if (ia != NULL)
+ mtu = min(mtu, ia->ia_ifp->if_mtu);
+ } else {
if (ia != NULL)
mtu = ia->ia_ifp->if_mtu;
else
==== //depot/projects/dtrace7/src/sys/netinet/ip_ipsec.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.8.2.1 2008/03/21 23:22:06 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/netinet/ip_ipsec.c,v 1.8.2.2 2008/04/22 12:02:55 bz Exp $");
#include "opt_ipsec.h"
@@ -191,9 +191,8 @@
* Returns MTU suggestion for ICMP needfrag reply.
*/
int
-ip_ipsec_mtu(struct mbuf *m)
+ip_ipsec_mtu(struct mbuf *m, int mtu)
{
- int mtu = 0;
/*
* If the packet is routed over IPsec tunnel, tell the
* originator the tunnel MTU.
==== //depot/projects/dtrace7/src/sys/netinet/ip_ipsec.h#2 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/netinet/ip_ipsec.h,v 1.2 2007/08/05 16:16:15 bz Exp $
+ * $FreeBSD: src/sys/netinet/ip_ipsec.h,v 1.2.2.1 2008/04/22 12:02:55 bz Exp $
*/
#ifndef _NETINET_IP_IPSEC_H_
@@ -35,7 +35,7 @@
int ip_ipsec_filtertunnel(struct mbuf *);
int ip_ipsec_fwd(struct mbuf *);
int ip_ipsec_input(struct mbuf *);
-int ip_ipsec_mtu(struct mbuf *);
+int ip_ipsec_mtu(struct mbuf *, int);
int ip_ipsec_output(struct mbuf **, struct inpcb *, int *, int *,
struct route **, struct route *, struct sockaddr_in **,
struct in_ifaddr **, struct ifnet **);
==== //depot/projects/dtrace7/src/sys/netinet/tcp_var.h#4 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)tcp_var.h 8.4 (Berkeley) 5/24/95
- * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.157.2.2 2008/03/11 06:34:28 silby Exp $
+ * $FreeBSD: src/sys/netinet/tcp_var.h,v 1.157.2.3 2008/04/22 11:57:04 bz Exp $
*/
#ifndef _NETINET_TCP_VAR_H_
@@ -235,17 +235,14 @@
* to tcp_dooptions and tcp_addoptions.
* The binary order of the to_flags is relevant for packing of the
* options in tcp_addoptions.
- * SACK should be kept after TS; some broken cable modem / router
- * devices were found in the field that ignore SYN-ACKs with
- * SACK before TS.
*/
struct tcpopt {
u_long to_flags; /* which options are present */
#define TOF_MSS 0x0001 /* maximum segment size */
#define TOF_SCALE 0x0002 /* window scaling */
+#define TOF_SACKPERM 0x0004 /* SACK permitted */
#define TOF_TS 0x0010 /* timestamp */
-#define TOF_SIGNATURE 0x0020 /* TCP-MD5 signature option (RFC2385) */
-#define TOF_SACKPERM 0x0040 /* SACK permitted */
+#define TOF_SIGNATURE 0x0040 /* TCP-MD5 signature option (RFC2385) */
#define TOF_SACK 0x0080 /* Peer sent SACK option */
#define TOF_MAXOPT 0x0100
u_int32_t to_tsval; /* new timestamp */
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 22:40:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 48641106566B; Tue, 22 Apr 2008 22:40:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id E62581065675
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:40:32 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id E131D8FC16
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:40:32 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MMeW4Y014790
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:40:32 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MMeWK9014788
for perforce@freebsd.org; Tue, 22 Apr 2008 22:40:32 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 22:40:32 GMT
Message-Id: <200804222240.m3MMeWK9014788@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140432 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 22:40:33 -0000
http://perforce.freebsd.org/chv.cgi?CH=140432
Change 140432 by jb@freebsd3 on 2008/04/22 22:40:12
IF6
Affected files ...
.. //depot/projects/dtrace6/src/bin/sh/cd.c#2 integrate
.. //depot/projects/dtrace6/src/bin/sh/options.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/CHANGES#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/FREEBSD-Xlist#2 delete
.. //depot/projects/dtrace6/src/contrib/bzip2/FREEBSD-upgrade#2 delete
.. //depot/projects/dtrace6/src/contrib/bzip2/LICENSE#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/Makefile#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/Makefile-libbz2_so#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/README#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/blocksort.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/bzip2.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/bzip2recover.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/bzlib.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/bzlib.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/bzlib_private.h#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/compress.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/crctable.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/decompress.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/huffman.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/randtable.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/spewG.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/bzip2/unzcrash.c#2 integrate
.. //depot/projects/dtrace6/src/contrib/gcc/config/i386/freebsd64.h#2 integrate
.. //depot/projects/dtrace6/src/crypto/openssh/channels.c#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/cc/cc_tools/Makefile#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/cc/cc_tools/freebsd64-fix.h#2 delete
.. //depot/projects/dtrace6/src/lib/libc/stdlib/strfmon.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libutil/humanize_number.c#2 integrate
.. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/errata/article.sgml#4 integrate
.. //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 integrate
.. //depot/projects/dtrace6/src/sys/dev/acpi_support/acpi_asus.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mii/ip1000phy.c#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mii/ip1000phyreg.h#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/mii/miidevs#4 integrate
.. //depot/projects/dtrace6/src/sys/dev/mii/rgephy.c#3 integrate
.. //depot/projects/dtrace6/src/sys/net/if_tap.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netgraph/ng_base.c#6 integrate
.. //depot/projects/dtrace6/src/sys/pci/if_rl.c#3 integrate
.. //depot/projects/dtrace6/src/usr.sbin/sysinstall/menus.c#6 integrate
Differences ...
==== //depot/projects/dtrace6/src/bin/sh/cd.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.34.8.1 2006/06/28 21:14:23 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/cd.c,v 1.34.8.2 2008/04/20 18:08:12 stefanf Exp $");
#include <sys/types.h>
#include <sys/stat.h>
@@ -68,7 +68,9 @@
STATIC int cdphysical(char *);
STATIC int docd(char *, int, int);
STATIC char *getcomponent(void);
-STATIC int updatepwd(char *);
+STATIC char *findcwd(char *);
+STATIC void updatepwd(char *);
+STATIC char *getpwd2(char *, size_t);
STATIC char *curdir = NULL; /* current working directory */
STATIC char *prevdir; /* previous working directory */
@@ -201,10 +203,11 @@
}
INTOFF;
- if (updatepwd(badstat ? NULL : dest) < 0 || chdir(curdir) < 0) {
+ if ((p = findcwd(badstat ? NULL : dest)) == NULL || chdir(p) < 0) {
INTON;
return (-1);
}
+ updatepwd(p);
INTON;
return (0);
}
@@ -212,12 +215,14 @@
STATIC int
cdphysical(char *dest)
{
+ char *p;
INTOFF;
- if (chdir(dest) < 0 || updatepwd(NULL) < 0) {
+ if (chdir(dest) < 0 || (p = findcwd(NULL)) == NULL) {
INTON;
return (-1);
}
+ updatepwd(p);
INTON;
return (0);
}
@@ -247,38 +252,20 @@
}
-/*
- * Update curdir (the name of the current directory) in response to a
- * cd command. We also call hashcd to let the routines in exec.c know
- * that the current directory has changed.
- */
-STATIC int
-updatepwd(char *dir)
+STATIC char *
+findcwd(char *dir)
{
char *new;
char *p;
- hashcd(); /* update command hash table */
-
/*
* If our argument is NULL, we don't know the current directory
* any more because we traversed a symbolic link or something
* we couldn't stat().
*/
if (dir == NULL || curdir == NULL) {
- if (prevdir)
- ckfree(prevdir);
- INTOFF;
- prevdir = curdir;
- curdir = NULL;
- if (getpwd() == NULL) {
- INTON;
- return (-1);
- }
- setvar("PWD", curdir, VEXPORT);
- setvar("OLDPWD", prevdir, VEXPORT);
- INTON;
- return (0);
+ p = stalloc(PATH_MAX);
+ return getpwd2(p, PATH_MAX);
}
cdcomppath = stalloc(strlen(dir) + 1);
scopy(dir, cdcomppath);
@@ -302,16 +289,25 @@
if (new == stackblock())
STPUTC('/', new);
STACKSTRNUL(new);
- INTOFF;
+ return stackblock();
+}
+
+/*
+ * Update curdir (the name of the current directory) in response to a
+ * cd command. We also call hashcd to let the routines in exec.c know
+ * that the current directory has changed.
+ */
+STATIC void
+updatepwd(char *dir)
+{
+ hashcd(); /* update command hash table */
+
if (prevdir)
ckfree(prevdir);
prevdir = curdir;
- curdir = savestr(stackblock());
+ curdir = savestr(dir);
setvar("PWD", curdir, VEXPORT);
setvar("OLDPWD", prevdir, VEXPORT);
- INTON;
-
- return (0);
}
int
@@ -355,17 +351,31 @@
}
/*
- * Find out what the current directory is. If we already know the current
- * directory, this routine returns immediately.
+ * Get the current directory and cache the result in curdir.
*/
char *
getpwd(void)
{
char buf[PATH_MAX];
+ char *p;
if (curdir)
return curdir;
- if (getcwd(buf, sizeof(buf)) == NULL) {
+
+ p = getpwd2(buf, sizeof(buf));
+ if (p != NULL)
+ curdir = savestr(p);
+
+ return curdir;
+}
+
+/*
+ * Return the current directory.
+ */
+STATIC char *
+getpwd2(char *buf, size_t size)
+{
+ if (getcwd(buf, size) == NULL) {
char *pwd = getenv("PWD");
struct stat stdot, stpwd;
@@ -373,12 +383,9 @@
stat(pwd, &stpwd) != -1 &&
stdot.st_dev == stpwd.st_dev &&
stdot.st_ino == stpwd.st_ino) {
- curdir = savestr(pwd);
- return curdir;
+ return pwd;
}
return NULL;
}
- curdir = savestr(buf);
-
- return curdir;
+ return buf;
}
==== //depot/projects/dtrace6/src/bin/sh/options.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
#endif
#endif /* not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.23.2.2 2006/06/03 15:38:07 stefanf Exp $");
+__FBSDID("$FreeBSD: src/bin/sh/options.c,v 1.23.2.3 2008/04/20 18:08:46 stefanf Exp $");
#include <signal.h>
#include <unistd.h>
@@ -383,7 +383,7 @@
}
ap2 = shellparam.p;
while ((*ap2++ = *ap1++) != NULL);
- shellparam.optnext = NULL;
+ shellparam.reset = 1;
INTON;
return 0;
}
@@ -405,6 +405,7 @@
if (*argptr != NULL) {
setparam(argptr);
}
+ shellparam.reset = 1;
INTON;
return 0;
}
@@ -414,7 +415,6 @@
getoptsreset(const char *value)
{
if (number(value) == 1) {
- shellparam.optnext = NULL;
shellparam.reset = 1;
}
}
==== //depot/projects/dtrace6/src/contrib/bzip2/CHANGES#2 (text+ko) ====
@@ -2,8 +2,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -312,3 +312,8 @@
* Fix minor doc/comment bugs.
+
+1.0.5 (10 Dec 07)
+~~~~~~~~~~~~~~~~~
+Security fix only. Fixes CERT-FI 20469 as it applies to bzip2.
+
==== //depot/projects/dtrace6/src/contrib/bzip2/LICENSE#2 (text+ko) ====
@@ -2,7 +2,7 @@
--------------------------------------------------------------------------
This program, "bzip2", the associated library "libbzip2", and all
-documentation, are copyright (C) 1996-2006 Julian R Seward. All
+documentation, are copyright (C) 1996-2007 Julian R Seward. All
rights reserved.
Redistribution and use in source and binary forms, with or without
@@ -36,8 +36,7 @@
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-Julian Seward, Cambridge, UK.
-jseward@bzip.org
-bzip2/libbzip2 version 1.0.4 of 20 December 2006
+Julian Seward, jseward@bzip.org
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
--------------------------------------------------------------------------
==== //depot/projects/dtrace6/src/contrib/bzip2/Makefile#2 (text+ko) ====
@@ -2,8 +2,8 @@
# This file is part of bzip2/libbzip2, a program and library for
# lossless, block-sorting data compression.
#
-# bzip2/libbzip2 version 1.0.4 of 20 December 2006
-# Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+# bzip2/libbzip2 version 1.0.5 of 10 December 2007
+# Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
#
# Please read the WARNING, DISCLAIMER and PATENTS sections in the
# README file.
@@ -137,7 +137,7 @@
distclean: clean
rm -f manual.ps manual.html manual.pdf
-DISTNAME=bzip2-1.0.4
+DISTNAME=bzip2-1.0.5
dist: check manual
rm -f $(DISTNAME)
ln -s -f . $(DISTNAME)
==== //depot/projects/dtrace6/src/contrib/bzip2/Makefile-libbz2_so#2 (text+ko) ====
@@ -10,8 +10,8 @@
# This file is part of bzip2/libbzip2, a program and library for
# lossless, block-sorting data compression.
#
-# bzip2/libbzip2 version 1.0.4 of 20 December 2006
-# Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+# bzip2/libbzip2 version 1.0.5 of 10 December 2007
+# Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
#
# Please read the WARNING, DISCLAIMER and PATENTS sections in the
# README file.
==== //depot/projects/dtrace6/src/contrib/bzip2/README#2 (text+ko) ====
@@ -6,8 +6,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
-bzip2/libbzip2 version 1.0.4 of 20 December 2006
-Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
+Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in this file.
@@ -177,7 +177,11 @@
See the CHANGES file.
+WHAT'S NEW IN 1.0.5 ?
+ See the CHANGES file.
+
+
I hope you find bzip2 useful. Feel free to contact me at
jseward@bzip.org
if you have any suggestions or queries. Many people mailed me with
@@ -203,3 +207,4 @@
30 December 2001 (bzip2, version 1.0.2pre1)
15 February 2005 (bzip2, version 1.0.3)
20 December 2006 (bzip2, version 1.0.4)
+10 December 2007 (bzip2, version 1.0.5)
==== //depot/projects/dtrace6/src/contrib/bzip2/README.COMPILATION.PROBLEMS#2 (text+ko) ====
@@ -2,8 +2,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
-bzip2/libbzip2 version 1.0.4 of 20 December 2006
-Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+bzip2/libbzip2 version 1.0.5 of 10 December 2007
+Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -12,7 +12,7 @@
in the file LICENSE.
------------------------------------------------------------------
-bzip2-1.0.4 should compile without problems on the vast majority of
+bzip2-1.0.5 should compile without problems on the vast majority of
platforms. Using the supplied Makefile, I've built and tested it
myself for x86-linux and amd64-linux. With makefile.msc, Visual C++
6.0 and nmake, you can build a native Win32 version too. Large file
==== //depot/projects/dtrace6/src/contrib/bzip2/blocksort.c#2 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace6/src/contrib/bzip2/bzip2.c#2 (text+ko) ====
@@ -7,8 +7,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -1605,11 +1605,11 @@
"bzip2, a block-sorting file compressor. "
"Version %s.\n"
" \n"
- " Copyright (C) 1996-2006 by Julian Seward.\n"
+ " Copyright (C) 1996-2007 by Julian Seward.\n"
" \n"
" This program is free software; you can redistribute it and/or modify\n"
" it under the terms set out in the LICENSE file, which is included\n"
- " in the bzip2-1.0.4 source distribution.\n"
+ " in the bzip2-1.0.5 source distribution.\n"
" \n"
" This program is distributed in the hope that it will be useful,\n"
" but WITHOUT ANY WARRANTY; without even the implied warranty of\n"
==== //depot/projects/dtrace6/src/contrib/bzip2/bzip2recover.c#2 (text+ko) ====
@@ -7,8 +7,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -313,7 +313,7 @@
inFileName[0] = outFileName[0] = 0;
fprintf ( stderr,
- "bzip2recover 1.0.4: extracts blocks from damaged .bz2 files.\n" );
+ "bzip2recover 1.0.5: extracts blocks from damaged .bz2 files.\n" );
if (argc != 2) {
fprintf ( stderr, "%s: usage is `%s damaged_file_name'.\n",
==== //depot/projects/dtrace6/src/contrib/bzip2/bzlib.c#2 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.2.2.1 2007/07/11 07:04:05 delphij Exp $");
+__FBSDID("$FreeBSD: src/contrib/bzip2/bzlib.c,v 1.2.2.2 2008/04/17 00:49:19 delphij Exp $");
#include "bzlib_private.h"
@@ -52,7 +52,7 @@
"component, you should also report this bug to the author(s)\n"
"of that program. Please make an effort to report this bug;\n"
"timely and accurate bug reports eventually lead to higher\n"
- "quality software. Thanks. Julian Seward, 15 February 2005.\n\n",
+ "quality software. Thanks. Julian Seward, 10 December 2007.\n\n",
errcode,
BZ2_bzlibVersion()
);
@@ -605,6 +605,7 @@
UInt32 c_tPos = s->tPos;
char* cs_next_out = s->strm->next_out;
unsigned int cs_avail_out = s->strm->avail_out;
+ Int32 ro_blockSize100k = s->blockSize100k;
/* end restore */
UInt32 avail_out_INIT = cs_avail_out;
==== //depot/projects/dtrace6/src/contrib/bzip2/bzlib.h#2 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace6/src/contrib/bzip2/bzlib_private.h#2 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
@@ -36,7 +36,7 @@
/*-- General stuff. --*/
-#define BZ_VERSION "1.0.4, 20-Dec-2006"
+#define BZ_VERSION "1.0.5, 10-Dec-2007"
typedef char Char;
typedef unsigned char Bool;
@@ -442,11 +442,15 @@
/*-- Macros for decompression. --*/
#define BZ_GET_FAST(cccc) \
+ /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+ if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
s->tPos = s->tt[s->tPos]; \
cccc = (UChar)(s->tPos & 0xff); \
s->tPos >>= 8;
#define BZ_GET_FAST_C(cccc) \
+ /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+ if (c_tPos >= (UInt32)100000 * (UInt32)ro_blockSize100k) return True; \
c_tPos = c_tt[c_tPos]; \
cccc = (UChar)(c_tPos & 0xff); \
c_tPos >>= 8;
@@ -469,8 +473,10 @@
(((UInt32)s->ll16[i]) | (GET_LL4(i) << 16))
#define BZ_GET_SMALL(cccc) \
- cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \
- s->tPos = GET_LL(s->tPos);
+ /* c_tPos is unsigned, hence test < 0 is pointless. */ \
+ if (s->tPos >= (UInt32)100000 * (UInt32)s->blockSize100k) return True; \
+ cccc = BZ2_indexIntoF ( s->tPos, s->cftab ); \
+ s->tPos = GET_LL(s->tPos);
/*-- externs for decompression. --*/
==== //depot/projects/dtrace6/src/contrib/bzip2/compress.c#2 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace6/src/contrib/bzip2/crctable.c#2 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace6/src/contrib/bzip2/decompress.c#2 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace6/src/contrib/bzip2/huffman.c#2 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace6/src/contrib/bzip2/randtable.c#2 (text+ko) ====
@@ -8,8 +8,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace6/src/contrib/bzip2/spewG.c#2 (text+ko) ====
@@ -13,8 +13,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace6/src/contrib/bzip2/unzcrash.c#2 (text+ko) ====
@@ -17,8 +17,8 @@
This file is part of bzip2/libbzip2, a program and library for
lossless, block-sorting data compression.
- bzip2/libbzip2 version 1.0.4 of 20 December 2006
- Copyright (C) 1996-2006 Julian Seward <jseward@bzip.org>
+ bzip2/libbzip2 version 1.0.5 of 10 December 2007
+ Copyright (C) 1996-2007 Julian Seward <jseward@bzip.org>
Please read the WARNING, DISCLAIMER and PATENTS sections in the
README file.
==== //depot/projects/dtrace6/src/contrib/gcc/config/i386/freebsd64.h#2 (text+ko) ====
@@ -19,7 +19,7 @@
the Free Software Foundation, 59 Temple Place - Suite 330,
Boston, MA 02111-1307, USA. */
-/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.9 2004/07/28 04:44:23 kan Exp $ */
+/* $FreeBSD: src/contrib/gcc/config/i386/freebsd64.h,v 1.9.8.1 2008/04/18 16:06:45 obrien Exp $ */
#undef TARGET_VERSION
@@ -56,3 +56,6 @@
%{!dynamic-linker:-dynamic-linker %(fbsd_dynamic_linker) }} \
%{static:-Bstatic}} \
%{symbolic:-Bsymbolic}"
+
+#undef MCOUNT_NAME
+#define MCOUNT_NAME ".mcount"
==== //depot/projects/dtrace6/src/crypto/openssh/channels.c#2 (text+ko) ====
@@ -2895,9 +2895,6 @@
debug2("bind port %d: %.100s", port, strerror(errno));
close(sock);
- if (ai->ai_next)
- continue;
-
for (n = 0; n < num_socks; n++) {
close(socks[n]);
}
==== //depot/projects/dtrace6/src/gnu/usr.bin/cc/cc_tools/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.81.2.2 2006/09/29 01:56:01 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc_tools/Makefile,v 1.81.2.3 2008/04/18 16:06:46 obrien Exp $
#
# This could probably be merged with ../cc_int/Makefile, but bsd.lib.mk
@@ -247,7 +247,6 @@
.if ${TARGET_ARCH} == "amd64"
TARGET_INC+= ${GCC_CPU}/x86-64.h
TARGET_INC+= ${GCC_CPU}/freebsd64.h
-TARGET_INC+= freebsd64-fix.h
.endif
.if ${TARGET_ARCH} == "powepc"
TARGET_INC+= altivec-defs.h
==== //depot/projects/dtrace6/src/lib/libc/stdlib/strfmon.c#2 (text+ko) ====
@@ -26,13 +26,14 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.14 2003/03/20 08:18:55 ache Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.14.12.1 2008/04/22 13:23:34 ru Exp $");
#include <sys/types.h>
#include <ctype.h>
#include <errno.h>
#include <limits.h>
#include <locale.h>
+#include <monetary.h>
#include <stdarg.h>
#include <stdio.h>
#include <stdlib.h>
@@ -66,6 +67,8 @@
while (isdigit((unsigned char)*fmt)) { \
VAR *= 10; \
VAR += *fmt - '0'; \
+ if (VAR < 0) \
+ goto e2big_error; \
fmt++; \
} \
} while (0)
@@ -186,7 +189,7 @@
/* Do we have enough space to put number with
* required width ?
*/
- if (dst + width >= s + maxsize)
+ if ((unsigned int)width >= maxsize - (dst - s))
goto e2big_error;
}
@@ -195,6 +198,8 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(left_prec);
+ if ((unsigned int)left_prec >= maxsize - (dst - s))
+ goto e2big_error;
}
/* Right precision */
@@ -202,6 +207,9 @@
if (!isdigit((unsigned char)*++fmt))
goto format_error;
GET_NUMBER(right_prec);
+ if ((unsigned int)right_prec >= maxsize - (dst - s) -
+ left_prec)
+ goto e2big_error;
}
/* Conversion Characters */
@@ -217,6 +225,8 @@
goto format_error;
}
+ if (currency_symbol != NULL)
+ free(currency_symbol);
if (flags & USE_INTL_CURRENCY) {
currency_symbol = strdup(lc->int_curr_symbol);
if (currency_symbol != NULL)
@@ -245,6 +255,8 @@
pad_size = 0;
}
+ if (asciivalue != NULL)
+ free(asciivalue);
asciivalue = __format_grouped_double(value, &flags,
left_prec, right_prec, pad_char);
if (asciivalue == NULL)
@@ -534,12 +546,11 @@
/* make sure that we've enough space for result string */
bufsize = strlen(avalue)*2+1;
- rslt = malloc(bufsize);
+ rslt = calloc(1, bufsize);
if (rslt == NULL) {
free(avalue);
return (NULL);
}
- memset(rslt, 0, bufsize);
bufend = rslt + bufsize - 1; /* reserve space for trailing '\0' */
/* skip spaces at beggining */
==== //depot/projects/dtrace6/src/lib/libutil/humanize_number.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $NetBSD: humanize_number.c,v 1.8 2004/07/27 01:56:24 enami Exp $ */
+/* $NetBSD: humanize_number.c,v 1.13 2007/12/14 17:26:19 christos Exp $ */
/*
* Copyright (c) 1997, 1998, 1999, 2002 The NetBSD Foundation, Inc.
@@ -38,10 +38,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libutil/humanize_number.c,v 1.2 2004/09/25 14:11:34 pjd Exp $");
+__FBSDID("$FreeBSD: src/lib/libutil/humanize_number.c,v 1.2.2.1 2008/04/20 16:32:20 antoine Exp $");
#include <sys/types.h>
#include <assert.h>
+#include <inttypes.h>
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
@@ -118,7 +119,12 @@
for (max = 100, i = len - baselen; i-- > 0;)
max *= 10;
- for (i = 0; bytes >= max && i < maxscale; i++)
+ /*
+ * Divide the number until it fits the given column.
+ * If there will be an overflow by the rounding below,
+ * divide once more.
+ */
+ for (i = 0; bytes >= max - 50 && i < maxscale; i++)
bytes /= divisor;
if (scale & HN_GETSCALE)
@@ -139,9 +145,8 @@
sign * s1, localeconv()->decimal_point, s2,
sep, SCALE2PREFIX(i), suffix);
} else
- r = snprintf(buf, len, "%lld%s%s%s",
- /* LONGLONG */
- (long long)(sign * ((bytes + 50) / 100)),
+ r = snprintf(buf, len, "%" PRId64 "%s%s%s",
+ sign * ((bytes + 50) / 100),
sep, SCALE2PREFIX(i), suffix);
return (r);
==== //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/errata/article.sgml#4 (text+ko) ====
@@ -27,7 +27,7 @@
The &os; Project
</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.2.56 2008/03/27 04:55:06 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73.2.58 2008/04/20 17:55:48 bmah Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -140,6 +140,12 @@
<entry>14 February 2008</entry>
<entry><para>&man.sendfile.2; write-only file permission bypass</para></entry>
</row>
+ <row>
+ <entry><ulink url="http://security.freebsd.org/advisories/FreeBSD-SA-08:05.openssh.asc"
+ >SA-08:05.openssh</ulink></entry>
+ <entry>17 April 2008</entry>
+ <entry><para>OpenSSH X11-forwarding privilege escalation</para></entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
@@ -153,11 +159,13 @@
faults for some Linux programs using &man.mmap.2;. This issue
has been fixed on the HEAD and RELENG_6 branches.</para>
- <para>[20080229] Multithreaded programs that perform a
+ <para>[20080229, updated 20080420] Multithreaded programs that perform a
&man.fork.2; operation may crash due to a race condition in the
- threading library. This problem has been fixed on the HEAD and
- RELENG_6 branches, and is a candidate for an errata
- notice.</para>
+ threading library. This problem has been fixed on the HEAD,
+ RELENG_6, and RELENG_6_3 branches, and is addressed by errata
+ notice
+ <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-EN-08:01.libpthread.asc">FreeBSD-EN-08:01.libpthread</ulink>.
+ </para>
<para>[20080307] When using &man.sysinstall.8; to install the
X.org packages, selecting only specific components to be
@@ -169,6 +177,12 @@
select <guimenuitem>All</guimenuitem> from the Distributions
menu.</para>
+ <para>[20080420] A reference counting bug in the IP multicast code
+ could cause kernel panics under some circumstances. It has been
+ fixed on the RELENG_6 branch by
+ revision <literal>1.85.2.10</literal>
+ of <filename>sys/netinet/in.c</filename>.</para>
+
</sect1>
</article>
==== //depot/projects/dtrace6/src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml#9 (text+ko) ====
@@ -3,7 +3,7 @@
<corpauthor>The &os; Project</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.883.2.91 2008/04/06 05:34:14 bmah Exp $</pubdate>
+ <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/common/new.sgml,v 1.883.2.92 2008/04/17 01:00:53 delphij Exp $</pubdate>
<copyright>
<year>2000</year>
@@ -199,6 +199,9 @@
<sect2 id="contrib">
<title>Contributed Software</title>
+ <para><application>bzip2</application> has been updated from 1.0.4
+ to 1.0.5.</para>
+
<para>The timezone database has been updated from
the <application>tzdata2007k</application> release to
the <application>tzdata2008b</application> release.</para>
==== //depot/projects/dtrace6/src/sys/dev/acpi_support/acpi_asus.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.24.2.3 2007/06/03 22:44:23 philip Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpi_support/acpi_asus.c,v 1.24.2.4 2008/04/22 12:44:36 rpaulo Exp $");
/*
* Driver for extra ACPI-controlled gadgets (hotkeys, leds, etc) found on
@@ -354,6 +354,20 @@
{ .name = NULL }
};
+/*
+ * EeePC have an Asus ASUS010 gadget interface,
+ * but they can't be probed quite the same way as Asus laptops.
+ */
+static struct acpi_asus_model acpi_eeepc_models[] = {
+ {
+ .name = "EEE",
+ .brn_get = "\\_SB.ATKD.PBLG",
+ .brn_set = "\\_SB.ATKD.PBLS"
+ },
+
+ { .name = NULL }
+};
+
static struct {
char *name;
char *description;
@@ -423,13 +437,17 @@
ACPI_BUFFER Buf;
ACPI_OBJECT Arg, *Obj;
ACPI_OBJECT_LIST Args;
- static char *asus_ids[] = { "ATK0100", NULL };
+ static char *asus_ids[] = { "ATK0100", "ASUS010", NULL };
+ char *rstr;
ACPI_FUNCTION_TRACE((char *)(uintptr_t)__func__);
- if (acpi_disabled("asus") ||
- ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids) == NULL)
+ if (acpi_disabled("asus"))
+ return (ENXIO);
+ rstr = ACPI_ID_PROBE(device_get_parent(dev), dev, asus_ids);
+ if (rstr == NULL) {
return (ENXIO);
+ }
sc = device_get_softc(dev);
sc->dev = dev;
@@ -468,6 +486,14 @@
AcpiOsFree(Buf.Pointer);
return (0);
}
+
+ /* if EeePC */
+ if (strncmp("ASUS010", rstr, 7) == 0) {
+ sc->model = &acpi_eeepc_models[0];
+ device_set_desc(dev, "ASUS EeePC");
+ AcpiOsFree(Buf.Pointer);
+ return (0);
+ }
}
sb = sbuf_new(NULL, NULL, 0, SBUF_AUTOEXTEND);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 22:46:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 454CB10656C3; Tue, 22 Apr 2008 22:46:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 07DB910656BF
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:46:42 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 04F258FC29
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:46:42 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MMkfd3014972
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:46:41 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MMkfbR014970
for perforce@freebsd.org; Tue, 22 Apr 2008 22:46:41 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 22:46:41 GMT
Message-Id: <200804222246.m3MMkfbR014970@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140433 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 22:46:42 -0000
http://perforce.freebsd.org/chv.cgi?CH=140433
Change 140433 by jb@freebsd3 on 2008/04/22 22:46:30
Weed out Solaris makefiles from the imported DTrace test tree. On FreeBSD we'll use our
own makefiles which are OBJDIR aware and reflect tests we are able to pass.
Affected files ...
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/amd64/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/i386/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparc/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparcv9/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i386/Makefile#2 delete
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/Makefile#2 delete
Differences ...
From owner-p4-projects@FreeBSD.ORG Tue Apr 22 22:55:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B4B161065673; Tue, 22 Apr 2008 22:55:53 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 761B6106566B
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:55:53 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 71DBE8FC17
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:55:53 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3MMtr1s015268
for <perforce@freebsd.org>; Tue, 22 Apr 2008 22:55:53 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3MMtqRN015266
for perforce@freebsd.org; Tue, 22 Apr 2008 22:55:52 GMT
(envelope-from jb@freebsd.org)
Date: Tue, 22 Apr 2008 22:55:52 GMT
Message-Id: <200804222255.m3MMtqRN015266@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140434 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 22 Apr 2008 22:55:54 -0000
http://perforce.freebsd.org/chv.cgi?CH=140434
Change 140434 by jb@freebsd3 on 2008/04/22 22:54:54
IFdtrace
Affected files ...
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/devid.h#4 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/libintl.h#4 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/mnttab.h#4 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/priv.h#4 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/solaris.h#4 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/zone.h#4 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.c#4 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.h#4 integrate
.. //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mkdirp.c#4 integrate
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/Makefile.subdirs#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/Makefile.com#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/amd64/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/i386/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparc/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/sparcv9/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/Makefile.com#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/i386/Makefile#2 delete
.. //depot/projects/dtrace7/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/sparc/Makefile#2 delete
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#4 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/rpc/xdr.h#4 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/acl.h#4 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/bitmap.h#2 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/byteorder.h#4 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/callb.h#4 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cpupart.h#2 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/dkio.h#4 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mntent.h#4 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/objfs.h#2 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq.h#4 integrate
.. //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#4 integrate
Differences ...
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/devid.h#4 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.3.2.2 2008/04/22 09:21:27 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.4 2008/04/22 07:42:58 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/libintl.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
#ifndef _LIBINTL_H_
#define _LIBINTL_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/mnttab.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
#ifndef _OPENSOLARIS_MNTTAB_H_
#define _OPENSOLARIS_MNTTAB_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/priv.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
#ifndef _OPENSOLARIS_PRIV_H_
#define _OPENSOLARIS_PRIV_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/solaris.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
#ifndef _SOLARIS_H_
#define _SOLARIS_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/include/zone.h#4 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $ */
+/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
#ifndef _ZONE_H_
#define _ZONE_H_
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.c#4 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Ricardo Correia. All rights reserved.
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/lib/libumem/umem.h#4 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/cddl/compat/opensolaris/misc/mkdirp.c#4 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.2.2.2 2008/04/22 09:21:28 jb Exp $
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/* Copyright (c) 1988 AT&T */
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#4 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c,v 1.3.2.2 2008/04/22 09:21:28 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c,v 1.4 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/rpc/xdr.h#4 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.3.2.2 2008/04/22 09:21:29 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
@@ -52,19 +52,6 @@
#define xdr_control(a,b,c) xdrmem_control(a,b,c)
/*
- * These are XDR control operators
- */
-
-#define XDR_GET_BYTES_AVAIL 1
-
-struct xdr_bytesrec {
- bool_t xc_is_last_record;
- size_t xc_num_avail;
-};
-
-typedef struct xdr_bytesrec xdr_bytesrec;
-
-/*
* These are the request arguments to XDR_CONTROL.
*
* XDR_PEEK - returns the contents of the next XDR unit on the XDR stream.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/acl.h#4 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/acl.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/acl.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/bitmap.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/bitmap.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/byteorder.h#4 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/byteorder.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/byteorder.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/callb.h#4 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/callb.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/callb.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cpupart.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpupart.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/dkio.h#4 (text+ko) ====
@@ -18,7 +18,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dkio.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dkio.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/mntent.h#4 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mntent.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mntent.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/objfs.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/objfs.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
#ifndef _COMPAT_OPENSOLARIS_SYS_OBJFS_H
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq.h#4 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/dtrace7/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#4 (text+ko) ====
@@ -19,7 +19,7 @@
*
* CDDL HEADER END
*
- * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq_impl.h,v 1.2.2.2 2008/04/22 09:21:29 jb Exp $
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq_impl.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
From owner-p4-projects@FreeBSD.ORG Wed Apr 23 00:23:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6DBAF1065673; Wed, 23 Apr 2008 00:23:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2F2E7106567F
for <perforce@freebsd.org>; Wed, 23 Apr 2008 00:23:27 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 2F1468FC27
for <perforce@freebsd.org>; Wed, 23 Apr 2008 00:23:27 +0000 (UTC)
(envelope-from marcel@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3N0NRLi020495
for <perforce@freebsd.org>; Wed, 23 Apr 2008 00:23:27 GMT
(envelope-from marcel@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3N0NRRQ020493
for perforce@freebsd.org; Wed, 23 Apr 2008 00:23:27 GMT
(envelope-from marcel@freebsd.org)
Date: Wed, 23 Apr 2008 00:23:27 GMT
Message-Id: <200804230023.m3N0NRRQ020493@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marcel@freebsd.org using -f
From: Marcel Moolenaar <marcel@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140435 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2008 00:23:27 -0000
http://perforce.freebsd.org/chv.cgi?CH=140435
Change 140435 by marcel@marcel_xcllnt on 2008/04/23 00:22:38
IFC @140427
Affected files ...
.. //depot/projects/bdb/sys/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/bdb/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/bdb/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/bdb/sys/arm/sa11x0/sa11x0_ost.c#2 integrate
.. //depot/projects/bdb/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/bdb/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/bdb/sys/i386/include/clock.h#3 integrate
.. //depot/projects/bdb/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/bdb/sys/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/bdb/sys/ia64/ia64/clock.c#3 integrate
.. //depot/projects/bdb/sys/ia64/ia64/machdep.c#5 integrate
.. //depot/projects/bdb/sys/kern/subr_clock.c#3 integrate
.. //depot/projects/bdb/sys/kern/subr_rtc.c#2 integrate
.. //depot/projects/bdb/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/bdb/sys/nfsclient/nfs_vfsops.c#4 integrate
.. //depot/projects/bdb/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/bdb/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/bdb/sys/powerpc/aim/clock.c#3 integrate
.. //depot/projects/bdb/sys/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/bdb/sys/powerpc/booke/clock.c#3 integrate
.. //depot/projects/bdb/sys/sys/clock.h#2 integrate
.. //depot/projects/bdb/sys/sys/time.h#3 integrate
Differences ...
==== //depot/projects/bdb/sys/amd64/amd64/machdep.c#5 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.684 2008/04/19 07:25:57 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -61,7 +61,6 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
==== //depot/projects/bdb/sys/amd64/include/clock.h#3 (text+ko) ====
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.60 2008/04/22 19:38:27 phk Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -27,6 +27,7 @@
* Driver to clock driver interface.
*/
+void startrtclock(void);
void init_TSC(void);
void init_TSC_tc(void);
==== //depot/projects/bdb/sys/amd64/isa/clock.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.243 2008/04/22 19:38:27 phk Exp $");
/*
* Routines to handle clock hardware.
@@ -45,7 +45,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
==== //depot/projects/bdb/sys/arm/sa11x0/sa11x0_ost.c#2 (text+ko) ====
@@ -38,14 +38,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.8 2008/04/22 19:38:27 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/time.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/module.h>
#include <machine/bus.h>
==== //depot/projects/bdb/sys/i386/bios/apm.c#2 (text+ko) ====
@@ -17,12 +17,11 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.150 2007/12/06 01:39:23 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/bios/apm.c,v 1.151 2008/04/22 19:38:27 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/conf.h>
#include <sys/condvar.h>
#include <sys/eventhandler.h>
==== //depot/projects/bdb/sys/i386/i386/machdep.c#3 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.668 2008/03/16 10:58:03 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/machdep.c,v 1.669 2008/04/22 19:38:27 phk Exp $");
#include "opt_apic.h"
#include "opt_atalk.h"
@@ -62,7 +62,6 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
==== //depot/projects/bdb/sys/i386/include/clock.h#3 (text+ko) ====
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $FreeBSD: src/sys/i386/include/clock.h,v 1.61 2008/04/14 08:00:00 phk Exp $
+ * $FreeBSD: src/sys/i386/include/clock.h,v 1.62 2008/04/22 19:38:28 phk Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -27,6 +27,7 @@
* Driver to clock driver interface.
*/
+void startrtclock(void);
void timer_restore(void);
void init_TSC(void);
void init_TSC_tc(void);
==== //depot/projects/bdb/sys/i386/isa/clock.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.247 2008/04/14 08:00:00 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/clock.c,v 1.248 2008/04/22 19:38:28 phk Exp $");
/*
* Routines to handle clock hardware.
@@ -48,7 +48,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
==== //depot/projects/bdb/sys/i386/isa/pmtimer.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/isa/pmtimer.c,v 1.6 2006/10/02 12:59:57 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/isa/pmtimer.c,v 1.7 2008/04/22 19:38:28 phk Exp $");
/*
* Timer device driver for power management events.
@@ -35,7 +35,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/kernel.h>
#include <sys/module.h>
#include <sys/syslog.h>
==== //depot/projects/bdb/sys/ia64/ia64/clock.c#3 (text+ko) ====
@@ -25,16 +25,14 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.33 2008/04/15 17:02:23 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/clock.c,v 1.34 2008/04/22 19:38:28 phk Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
-#include <sys/clock.h>
#include <sys/queue.h>
#include <sys/sysctl.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/timetc.h>
#include <sys/pcpu.h>
==== //depot/projects/bdb/sys/ia64/ia64/machdep.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.236 2008/04/15 05:02:42 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.237 2008/04/22 19:38:28 phk Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -261,7 +261,6 @@
*/
identifycpu();
- /* startrtclock(); */
#ifdef PERFMON
perfmon_init();
#endif
==== //depot/projects/bdb/sys/kern/subr_clock.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_clock.c,v 1.14 2008/04/12 21:51:54 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_clock.c,v 1.15 2008/04/22 19:38:28 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -52,18 +52,14 @@
#define ct_debug bootverbose
static int adjkerntz; /* local offset from GMT in seconds */
static int wall_cmos_clock; /* wall CMOS clock assumed if != 0 */
-int disable_rtc_set; /* disable resettodr() if != 0 */
int tz_minuteswest;
int tz_dsttime;
/*
- * These have traditionally been in machdep, but should probably be moved to
+ * This have traditionally been in machdep, but should probably be moved to
* kern.
*/
-SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
- CTLFLAG_RW, &disable_rtc_set, 0, "");
-
SYSCTL_INT(_machdep, OID_AUTO, wall_cmos_clock,
CTLFLAG_RW, &wall_cmos_clock, 0, "");
@@ -71,8 +67,7 @@
sysctl_machdep_adjkerntz(SYSCTL_HANDLER_ARGS)
{
int error;
- error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2,
- req);
+ error = sysctl_handle_int(oidp, oidp->oid_arg1, oidp->oid_arg2, req);
if (!error && req->newptr)
resettodr();
return (error);
==== //depot/projects/bdb/sys/kern/subr_rtc.c#2 (text+ko) ====
@@ -48,7 +48,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/subr_rtc.c,v 1.9 2006/10/02 18:23:37 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/subr_rtc.c,v 1.10 2008/04/22 19:38:28 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -63,6 +63,11 @@
static device_t clock_dev = NULL;
static long clock_res;
+/* XXX: should be kern. now, it's no longer machdep. */
+static int disable_rtc_set;
+SYSCTL_INT(_machdep, OID_AUTO, disable_rtc_set,
+ CTLFLAG_RW, &disable_rtc_set, 0, "");
+
void
clock_register(device_t dev, long res) /* res has units of microseconds */
{
@@ -118,6 +123,7 @@
"will not be set accurately\n");
return;
}
+ /* XXX: We should poll all registered RTCs in case of failure */
error = CLOCK_GETTIME(clock_dev, &ts);
if (error != 0 && error != EINVAL) {
printf("warning: clock_gettime failed (%d), the system time "
@@ -158,6 +164,7 @@
getnanotime(&ts);
ts.tv_sec -= utc_offset();
+ /* XXX: We should really set all registered RTCs */
if ((error = CLOCK_SETTIME(clock_dev, &ts)) != 0) {
printf("warning: clock_settime failed (%d), time-of-day clock "
"not adjusted to system time\n", error);
==== //depot/projects/bdb/sys/kern/vfs_mount.c#3 (text+ko) ====
@@ -35,11 +35,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.279 2008/04/08 17:53:33 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_mount.c,v 1.280 2008/04/22 19:38:28 phk Exp $");
#include <sys/param.h>
#include <sys/conf.h>
-#include <sys/clock.h>
#include <sys/fcntl.h>
#include <sys/jail.h>
#include <sys/kernel.h>
==== //depot/projects/bdb/sys/nfsclient/nfs_vfsops.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.203 2008/03/22 09:15:15 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/nfsclient/nfs_vfsops.c,v 1.204 2008/04/22 19:38:29 phk Exp $");
#include "opt_bootp.h"
@@ -44,7 +44,6 @@
#include <sys/kernel.h>
#include <sys/bio.h>
#include <sys/buf.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/malloc.h>
#include <sys/mbuf.h>
==== //depot/projects/bdb/sys/pc98/cbus/clock.c#3 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.168 2008/04/19 08:18:47 nyan Exp $");
+__FBSDID("$FreeBSD: src/sys/pc98/cbus/clock.c,v 1.169 2008/04/22 19:38:29 phk Exp $");
/*
* Routines to handle clock hardware.
@@ -51,7 +51,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
==== //depot/projects/bdb/sys/pc98/pc98/machdep.c#4 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.403 2008/03/16 10:58:08 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/pc98/pc98/machdep.c,v 1.404 2008/04/22 19:38:29 phk Exp $");
#include "opt_atalk.h"
#include "opt_compat.h"
@@ -60,7 +60,6 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
==== //depot/projects/bdb/sys/powerpc/aim/clock.c#3 (text+ko) ====
@@ -56,14 +56,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.32 2008/04/21 04:41:37 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/clock.c,v 1.33 2008/04/22 19:38:30 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/timetc.h>
#include <sys/interrupt.h>
==== //depot/projects/bdb/sys/powerpc/aim/machdep.c#5 (text+ko) ====
@@ -55,7 +55,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.112 2008/04/16 23:28:12 marcel Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/aim/machdep.c,v 1.113 2008/04/22 19:38:30 phk Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -196,7 +196,6 @@
*/
cpu_setup(PCPU_GET(cpuid));
- /* startrtclock(); */
#ifdef PERFMON
perfmon_init();
#endif
==== //depot/projects/bdb/sys/powerpc/booke/clock.c#3 (text+ko) ====
@@ -56,14 +56,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/booke/clock.c,v 1.3 2008/04/13 21:20:26 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/booke/clock.c,v 1.4 2008/04/22 19:38:30 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/sysctl.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/timetc.h>
#include <sys/interrupt.h>
==== //depot/projects/bdb/sys/sys/clock.h#2 (text+ko) ====
@@ -35,7 +35,20 @@
*
* $NetBSD: clock_subr.h,v 1.7 2000/10/03 13:41:07 tsutsui Exp $
*
- * $FreeBSD: src/sys/sys/clock.h,v 1.7 2006/10/24 10:27:23 phk Exp $
+ *
+ * This file is the central clearing-house for calendrical issues.
+ *
+ * In general the kernel does not know about minutes, hours, days, timezones,
+ * daylight savings time, leap-years and such. All that is theoretically a
+ * matter for userland only.
+ *
+ * Parts of kernel code does however care: badly designed filesystems store
+ * timestamps in local time and RTC chips sometimes track time in a local
+ * timezone instead of UTC and so on.
+ *
+ * All that code should go here for service.
+ *
+ * $FreeBSD: src/sys/sys/clock.h,v 1.8 2008/04/22 19:38:30 phk Exp $
*/
#ifndef _SYS_CLOCK_H_
@@ -44,15 +57,6 @@
#ifdef _KERNEL /* No user serviceable parts */
/*
- * Kernel to clock driver interface.
- */
-void inittodr(time_t base);
-void resettodr(void);
-void startrtclock(void);
-
-extern int disable_rtc_set;
-
-/*
* Timezone info from settimeofday(2), usually not used
*/
extern int tz_minuteswest;
==== //depot/projects/bdb/sys/sys/time.h#3 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)time.h 8.5 (Berkeley) 5/4/95
- * $FreeBSD: src/sys/sys/time.h,v 1.76 2008/03/31 12:14:04 kib Exp $
+ * $FreeBSD: src/sys/sys/time.h,v 1.77 2008/04/22 19:38:30 phk Exp $
*/
#ifndef _SYS_TIME_H_
@@ -255,6 +255,13 @@
#endif
#ifdef _KERNEL
+
+/*
+ * Kernel to clock driver interface.
+ */
+void inittodr(time_t base);
+void resettodr(void);
+
extern time_t time_second;
extern time_t time_uptime;
extern struct timeval boottime;
From owner-p4-projects@FreeBSD.ORG Wed Apr 23 03:53:52 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 475221065688; Wed, 23 Apr 2008 03:53:52 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id E1F401065676
for <perforce@freebsd.org>; Wed, 23 Apr 2008 03:53:51 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id E68CF8FC15
for <perforce@freebsd.org>; Wed, 23 Apr 2008 03:53:51 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3N3rpYA040405
for <perforce@freebsd.org>; Wed, 23 Apr 2008 03:53:51 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3N3roJu040403
for perforce@freebsd.org; Wed, 23 Apr 2008 03:53:50 GMT
(envelope-from sam@freebsd.org)
Date: Wed, 23 Apr 2008 03:53:50 GMT
Message-Id: <200804230353.m3N3roJu040403@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140443 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2008 03:53:52 -0000
http://perforce.freebsd.org/chv.cgi?CH=140443
Change 140443 by sam@sam_ebb on 2008/04/23 03:53:00
IFC @ 140442
Affected files ...
.. //depot/projects/vap/ObsoleteFiles.inc#9 integrate
.. //depot/projects/vap/UPDATING#8 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/devid.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/libintl.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/mnttab.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/priv.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/solaris.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/include/zone.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.c#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.h#2 integrate
.. //depot/projects/vap/cddl/compat/opensolaris/misc/mkdirp.c#2 integrate
.. //depot/projects/vap/contrib/gcc/gthr-posix.h#3 integrate
.. //depot/projects/vap/contrib/hostapd/driver_wired.c#3 delete
.. //depot/projects/vap/contrib/netcat/FREEBSD-upgrade#3 integrate
.. //depot/projects/vap/contrib/netcat/FREEBSD-vendor#1 branch
.. //depot/projects/vap/contrib/netcat/atomicio.c#3 integrate
.. //depot/projects/vap/contrib/netcat/atomicio.h#3 integrate
.. //depot/projects/vap/contrib/netcat/nc.1#4 integrate
.. //depot/projects/vap/etc/Makefile#5 integrate
.. //depot/projects/vap/etc/defaults/rc.conf#10 integrate
.. //depot/projects/vap/etc/network.subr#8 integrate
.. //depot/projects/vap/etc/rc.d/hostapd#4 integrate
.. //depot/projects/vap/etc/rc.d/initrandom#3 integrate
.. //depot/projects/vap/etc/rc.d/netif#7 integrate
.. //depot/projects/vap/etc/rc.d/wpa_supplicant#9 integrate
.. //depot/projects/vap/lib/libc/stdio/fopen.c#5 integrate
.. //depot/projects/vap/lib/libc/sys/cpuset.2#2 integrate
.. //depot/projects/vap/lib/libc/sys/cpuset_getaffinity.2#2 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_rtld.c#5 integrate
.. //depot/projects/vap/lib/libutil/Makefile#3 integrate
.. //depot/projects/vap/lib/libutil/gr_util.c#1 branch
.. //depot/projects/vap/lib/libutil/libutil.h#3 integrate
.. //depot/projects/vap/release/amd64/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 integrate
.. //depot/projects/vap/release/doc/en_US.ISO8859-1/relnotes/article.sgml#10 integrate
.. //depot/projects/vap/release/doc/share/misc/dev.archlist.txt#7 integrate
.. //depot/projects/vap/release/doc/share/sgml/release.dsl#3 integrate
.. //depot/projects/vap/release/doc/share/sgml/release.ent#3 integrate
.. //depot/projects/vap/release/i386/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/ia64/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/pc98/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/picobsd/bridge/crunch.conf#3 integrate
.. //depot/projects/vap/release/powerpc/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/sparc64/boot_crunch.conf#4 integrate
.. //depot/projects/vap/release/sun4v/boot_crunch.conf#4 integrate
.. //depot/projects/vap/sbin/ifconfig/Makefile#8 integrate
.. //depot/projects/vap/sbin/ifconfig/ifconfig.8#12 integrate
.. //depot/projects/vap/sbin/ifconfig/ifieee80211.c#19 integrate
.. //depot/projects/vap/sbin/ifconfig/ifmedia.c#6 integrate
.. //depot/projects/vap/share/man/man4/Makefile#12 integrate
.. //depot/projects/vap/share/man/man4/altq.4#3 integrate
.. //depot/projects/vap/share/man/man4/ath.4#5 integrate
.. //depot/projects/vap/share/man/man4/cnw.4#3 integrate
.. //depot/projects/vap/share/man/man4/ipw.4#5 integrate
.. //depot/projects/vap/share/man/man4/iwi.4#5 integrate
.. //depot/projects/vap/share/man/man4/malo.4#3 integrate
.. //depot/projects/vap/share/man/man4/ral.4#4 integrate
.. //depot/projects/vap/share/man/man4/rum.4#4 integrate
.. //depot/projects/vap/share/man/man4/textdump.4#2 integrate
.. //depot/projects/vap/share/man/man4/ural.4#5 integrate
.. //depot/projects/vap/share/man/man4/wi.4#5 integrate
.. //depot/projects/vap/share/man/man4/wlan.4#4 integrate
.. //depot/projects/vap/share/man/man4/wlan_acl.4#4 integrate
.. //depot/projects/vap/share/man/man4/wlan_amrr.4#4 integrate
.. //depot/projects/vap/share/man/man4/wlan_xauth.4#4 integrate
.. //depot/projects/vap/share/man/man4/wpi.4#4 integrate
.. //depot/projects/vap/share/man/man4/zyd.4#4 integrate
.. //depot/projects/vap/share/man/man5/Makefile#4 integrate
.. //depot/projects/vap/share/misc/committers-doc.dot#4 integrate
.. //depot/projects/vap/sys/amd64/amd64/machdep.c#10 integrate
.. //depot/projects/vap/sys/amd64/conf/GENERIC#13 integrate
.. //depot/projects/vap/sys/amd64/include/clock.h#7 integrate
.. //depot/projects/vap/sys/amd64/isa/clock.c#9 integrate
.. //depot/projects/vap/sys/arm/arm/intr.c#8 integrate
.. //depot/projects/vap/sys/arm/at91/at91.c#4 integrate
.. //depot/projects/vap/sys/arm/conf/AVILA#10 integrate
.. //depot/projects/vap/sys/arm/conf/BWCT#5 integrate
.. //depot/projects/vap/sys/arm/conf/CRB#5 integrate
.. //depot/projects/vap/sys/arm/conf/EP80219#5 integrate
.. //depot/projects/vap/sys/arm/conf/HL200#7 integrate
.. //depot/projects/vap/sys/arm/conf/IQ31244#7 integrate
.. //depot/projects/vap/sys/arm/conf/KB920X#7 integrate
.. //depot/projects/vap/sys/arm/conf/SIMICS#7 integrate
.. //depot/projects/vap/sys/arm/conf/SKYEYE#5 integrate
.. //depot/projects/vap/sys/arm/include/intr.h#6 integrate
.. //depot/projects/vap/sys/arm/sa11x0/sa11x0_ost.c#5 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/acl.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/bitmap.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/callb.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cpupart.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/dkio.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/objfs.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/vap/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 integrate
.. //depot/projects/vap/sys/compat/svr4/svr4_misc.c#7 integrate
.. //depot/projects/vap/sys/conf/NOTES#15 integrate
.. //depot/projects/vap/sys/conf/files#33 integrate
.. //depot/projects/vap/sys/conf/files.amd64#10 integrate
.. //depot/projects/vap/sys/conf/files.i386#10 integrate
.. //depot/projects/vap/sys/conf/files.pc98#9 integrate
.. //depot/projects/vap/sys/conf/options#20 integrate
.. //depot/projects/vap/sys/dev/ata/ata-all.c#9 integrate
.. //depot/projects/vap/sys/dev/ata/ata-chipset.c#11 integrate
.. //depot/projects/vap/sys/dev/ata/ata-pci.c#8 integrate
.. //depot/projects/vap/sys/dev/ata/ata-pci.h#8 integrate
.. //depot/projects/vap/sys/dev/ata/ata-queue.c#8 integrate
.. //depot/projects/vap/sys/dev/ath/ah_osdep.c#4 integrate
.. //depot/projects/vap/sys/dev/ath/ah_osdep.h#4 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.c#9 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/amrr/amrr.h#5 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.c#12 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/onoe/onoe.h#8 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.c#11 integrate
.. //depot/projects/vap/sys/dev/ath/ath_rate/sample/sample.h#7 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath.c#63 integrate
.. //depot/projects/vap/sys/dev/ath/if_ath_pci.c#7 integrate
.. //depot/projects/vap/sys/dev/ath/if_athioctl.h#7 integrate
.. //depot/projects/vap/sys/dev/ath/if_athrate.h#9 integrate
.. //depot/projects/vap/sys/dev/ath/if_athvar.h#21 integrate
.. //depot/projects/vap/sys/dev/if_ndis/if_ndis.c#15 integrate
.. //depot/projects/vap/sys/dev/if_ndis/if_ndisvar.h#11 integrate
.. //depot/projects/vap/sys/dev/ipw/if_ipw.c#14 integrate
.. //depot/projects/vap/sys/dev/ipw/if_ipwvar.h#10 integrate
.. //depot/projects/vap/sys/dev/iwi/if_iwi.c#27 integrate
.. //depot/projects/vap/sys/dev/iwi/if_iwivar.h#15 integrate
.. //depot/projects/vap/sys/dev/k8temp/k8temp.c#3 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo.c#7 integrate
.. //depot/projects/vap/sys/dev/malo/if_malo.h#4 integrate
.. //depot/projects/vap/sys/dev/ral/if_ral_pci.c#8 integrate
.. //depot/projects/vap/sys/dev/ral/rt2560.c#29 integrate
.. //depot/projects/vap/sys/dev/ral/rt2560reg.h#6 integrate
.. //depot/projects/vap/sys/dev/ral/rt2560var.h#17 integrate
.. //depot/projects/vap/sys/dev/ral/rt2661.c#27 integrate
.. //depot/projects/vap/sys/dev/ral/rt2661var.h#13 integrate
.. //depot/projects/vap/sys/dev/usb/if_rum.c#17 integrate
.. //depot/projects/vap/sys/dev/usb/if_rumvar.h#10 integrate
.. //depot/projects/vap/sys/dev/usb/if_ural.c#19 integrate
.. //depot/projects/vap/sys/dev/usb/if_uralvar.h#12 integrate
.. //depot/projects/vap/sys/dev/usb/if_zyd.c#17 integrate
.. //depot/projects/vap/sys/dev/usb/if_zydreg.h#9 integrate
.. //depot/projects/vap/sys/dev/usb/uipaq.c#4 integrate
.. //depot/projects/vap/sys/dev/usb/usbdevs#14 integrate
.. //depot/projects/vap/sys/dev/wi/if_wavelan_ieee.h#6 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi.c#27 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi_pccard.c#7 integrate
.. //depot/projects/vap/sys/dev/wi/if_wi_pci.c#8 integrate
.. //depot/projects/vap/sys/dev/wi/if_wivar.h#17 integrate
.. //depot/projects/vap/sys/dev/wpi/if_wpi.c#20 integrate
.. //depot/projects/vap/sys/dev/wpi/if_wpivar.h#8 integrate
.. //depot/projects/vap/sys/i386/bios/apm.c#7 integrate
.. //depot/projects/vap/sys/i386/conf/GENERIC#13 integrate
.. //depot/projects/vap/sys/i386/conf/PAE#7 integrate
.. //depot/projects/vap/sys/i386/i386/machdep.c#8 integrate
.. //depot/projects/vap/sys/i386/include/clock.h#8 integrate
.. //depot/projects/vap/sys/i386/isa/clock.c#9 integrate
.. //depot/projects/vap/sys/i386/isa/pmtimer.c#5 integrate
.. //depot/projects/vap/sys/ia64/conf/DEFAULTS#6 integrate
.. //depot/projects/vap/sys/ia64/ia64/clock.c#7 integrate
.. //depot/projects/vap/sys/ia64/ia64/machdep.c#13 integrate
.. //depot/projects/vap/sys/kern/kern_linker.c#9 integrate
.. //depot/projects/vap/sys/kern/subr_clock.c#6 integrate
.. //depot/projects/vap/sys/kern/subr_rtc.c#3 integrate
.. //depot/projects/vap/sys/kern/vfs_mount.c#13 integrate
.. //depot/projects/vap/sys/mips/conf/ADM5120#2 integrate
.. //depot/projects/vap/sys/mips/conf/IDT#3 integrate
.. //depot/projects/vap/sys/mips/conf/MALTA#2 integrate
.. //depot/projects/vap/sys/mips/conf/QEMU#2 integrate
.. //depot/projects/vap/sys/mips/conf/SENTRY5#3 integrate
.. //depot/projects/vap/sys/modules/Makefile#21 integrate
.. //depot/projects/vap/sys/modules/ath_rate_amrr/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/ath_rate_onoe/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/ath_rate_sample/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/malo/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/ral/Makefile#6 integrate
.. //depot/projects/vap/sys/modules/wlan/Makefile#9 integrate
.. //depot/projects/vap/sys/modules/wlan_acl/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_amrr/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_ccmp/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_tkip/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_wep/Makefile#4 integrate
.. //depot/projects/vap/sys/modules/wlan_xauth/Makefile#4 integrate
.. //depot/projects/vap/sys/net80211/_ieee80211.h#10 integrate
.. //depot/projects/vap/sys/net80211/ieee80211.c#39 integrate
.. //depot/projects/vap/sys/net80211/ieee80211.h#9 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_acl.c#10 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_amrr.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_amrr.h#6 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto.c#14 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto.h#13 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_ccmp.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_none.c#12 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_tkip.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_crypto_wep.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.c#28 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_freebsd.h#26 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ht.c#21 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ht.h#12 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_input.c#30 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.c#56 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ioctl.h#20 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_node.c#30 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_node.h#20 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_output.c#49 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_power.c#12 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_power.h#7 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_proto.c#30 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_proto.h#20 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.c#13 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_regdomain.h#7 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_scan.c#21 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_scan.h#13 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_scan_sta.c#24 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_var.h#40 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_xauth.c#10 integrate
.. //depot/projects/vap/sys/netinet/ip_divert.c#6 integrate
.. //depot/projects/vap/sys/netinet/raw_ip.c#7 integrate
.. //depot/projects/vap/sys/netinet/tcp_var.h#8 integrate
.. //depot/projects/vap/sys/netinet6/icmp6.c#8 integrate
.. //depot/projects/vap/sys/netinet6/raw_ip6.c#9 integrate
.. //depot/projects/vap/sys/netinet6/udp6_usrreq.c#8 integrate
.. //depot/projects/vap/sys/nfsclient/nfs_vfsops.c#11 integrate
.. //depot/projects/vap/sys/pc98/cbus/clock.c#6 integrate
.. //depot/projects/vap/sys/pc98/conf/GENERIC#11 integrate
.. //depot/projects/vap/sys/pc98/pc98/machdep.c#7 integrate
.. //depot/projects/vap/sys/powerpc/aim/clock.c#3 integrate
.. //depot/projects/vap/sys/powerpc/aim/machdep.c#6 integrate
.. //depot/projects/vap/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/vap/sys/powerpc/booke/clock.c#4 integrate
.. //depot/projects/vap/sys/powerpc/conf/DEFAULTS#4 integrate
.. //depot/projects/vap/sys/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/vap/sys/sparc64/conf/GENERIC#12 integrate
.. //depot/projects/vap/sys/sparc64/conf/NOTES#6 integrate
.. //depot/projects/vap/sys/sun4v/conf/DEFAULTS#3 integrate
.. //depot/projects/vap/sys/sun4v/conf/NOTES#3 integrate
.. //depot/projects/vap/sys/sys/clock.h#5 integrate
.. //depot/projects/vap/sys/sys/param.h#19 integrate
.. //depot/projects/vap/sys/sys/time.h#8 integrate
.. //depot/projects/vap/sys/ufs/ufs/inode.h#7 integrate
.. //depot/projects/vap/sys/ufs/ufs/ufs_lookup.c#8 integrate
.. //depot/projects/vap/tools/regression/environ/envctl.c#4 integrate
.. //depot/projects/vap/tools/regression/environ/envtest.t#3 integrate
.. //depot/projects/vap/tools/regression/lib/libutil/Makefile#3 integrate
.. //depot/projects/vap/tools/regression/lib/libutil/test-grp.c#1 branch
.. //depot/projects/vap/tools/regression/lib/libutil/test-grp.t#1 branch
.. //depot/projects/vap/tools/tools/nanobsd/Files/root/save_cfg#1 branch
.. //depot/projects/vap/tools/tools/net80211/Makefile#4 integrate
.. //depot/projects/vap/tools/tools/net80211/wlanstats/main.c#6 integrate
.. //depot/projects/vap/tools/tools/net80211/wlanstats/wlanstats.c#9 integrate
.. //depot/projects/vap/usr.bin/calendar/calendars/calendar.freebsd#7 integrate
.. //depot/projects/vap/usr.bin/procstat/procstat.1#3 integrate
.. //depot/projects/vap/usr.sbin/ancontrol/ancontrol.c#3 integrate
.. //depot/projects/vap/usr.sbin/wlandebug/wlandebug.c#5 integrate
.. //depot/projects/vap/usr.sbin/wpa/hostapd/Makefile#4 integrate
.. //depot/projects/vap/usr.sbin/wpa/hostapd/driver_freebsd.c#6 integrate
.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/Packet32.c#4 integrate
.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#10 integrate
Differences ...
==== //depot/projects/vap/ObsoleteFiles.inc#9 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.136 2008/04/01 11:05:26 flz Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.137 2008/04/20 16:03:19 antoine Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -19,6 +19,22 @@
OLD_FILES+=usr/sbin/pkg_sign
OLD_FILES+=usr/share/man/man1/pkg_check.1.gz
OLD_FILES+=usr/share/man/man1/pkg_sign.1.gz
+# 20080325: tzdata2008b import
+OLD_FILES+=usr/share/zoneinfo/Asia/Calcutta
+OLD_FILES+=usr/share/zoneinfo/Asia/Saigon
+# 20080314: stack_print(9) mlink fixed
+OLD_FILES+=usr/share/man/man9/stack_printf.9.gz
+# 20080312: libkse removal
+OLD_FILES+=usr/include/sys/kse.h
+OLD_FILES+=usr/lib/libkse.so
+OLD_LIBS+=usr/lib/libkse.so.3
+OLD_FILES+=usr/share/man/man2/kse.2.gz
+OLD_FILES+=usr/share/man/man2/kse_create.2.gz
+OLD_FILES+=usr/share/man/man2/kse_exit.2.gz
+OLD_FILES+=usr/share/man/man2/kse_release.2.gz
+OLD_FILES+=usr/share/man/man2/kse_switchin.2.gz
+OLD_FILES+=usr/share/man/man2/kse_thr_interrupt.2.gz
+OLD_FILES+=usr/share/man/man2/kse_wakeup.2.gz
# 20080220: geom_lvm rename to geom_linux_lvm
OLD_FILES+=usr/share/man/man4/geom_lvm.4.gz
# 20080126: oldcard.4 removal
==== //depot/projects/vap/UPDATING#8 (text+ko) ====
@@ -22,6 +22,16 @@
to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20080420:
+ The 802.11 wireless support was redone to enable multi-bss
+ operation on devices that are capable. The underlying device
+ is no longer used directly but instead wlanX devices are
+ cloned with ifconfig. This requires changes to rc.conf files.
+
+ As part of the multi-bss changes the wlan_scan_ap and wlan_scan_sta
+ modules were merged into the base wlan module. All references
+ to these modules (e.g. in kernel config files) must be removed.
+
20080408:
psm(4) has gained write(2) support in native operation level.
Arbitrary commands can be written to /dev/psm%d and status can
@@ -1014,4 +1024,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.524 2008/04/08 17:55:25 jkim Exp $
+$FreeBSD: src/UPDATING,v 1.525 2008/04/20 21:25:37 sam Exp $
==== //depot/projects/vap/cddl/compat/opensolaris/include/devid.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/include/devid.h,v 1.4 2008/04/22 07:42:58 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/vap/cddl/compat/opensolaris/include/libintl.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/libintl.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _LIBINTL_H_
#define _LIBINTL_H_
==== //depot/projects/vap/cddl/compat/opensolaris/include/mnttab.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/mnttab.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _OPENSOLARIS_MNTTAB_H_
#define _OPENSOLARIS_MNTTAB_H_
==== //depot/projects/vap/cddl/compat/opensolaris/include/priv.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/priv.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _OPENSOLARIS_PRIV_H_
#define _OPENSOLARIS_PRIV_H_
==== //depot/projects/vap/cddl/compat/opensolaris/include/solaris.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/solaris.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _SOLARIS_H_
#define _SOLARIS_H_
==== //depot/projects/vap/cddl/compat/opensolaris/include/zone.h#2 (text+ko) ====
@@ -1,3 +1,5 @@
+/* $FreeBSD: src/cddl/compat/opensolaris/include/zone.h,v 1.3 2008/04/22 07:42:58 jb Exp $ */
+
#ifndef _ZONE_H_
#define _ZONE_H_
==== //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.c#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.c,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Ricardo Correia. All rights reserved.
==== //depot/projects/vap/cddl/compat/opensolaris/lib/libumem/umem.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/lib/libumem/umem.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/vap/cddl/compat/opensolaris/misc/mkdirp.c#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/cddl/compat/opensolaris/misc/mkdirp.c,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/* Copyright (c) 1988 AT&T */
==== //depot/projects/vap/contrib/gcc/gthr-posix.h#3 (text+ko) ====
@@ -152,9 +152,12 @@
it is passed so we cannot pretend that the interface is active if -pthreads
is not specified. On Solaris 2.5.1, the interface is not exposed at all so
we need to play the usual game with weak symbols. On Solaris 10 and up, a
- working interface is always exposed. */
+ working interface is always exposed. On FreeBSD 6 and later, libc also
+ exposes a dummy POSIX threads interface, similar to what Solaris 2.6 up
+ to 9 does. FreeBSD >= 700014 even provides a pthread_cancel stub in libc,
+ which means the alternate __gthread_active_p below cannot be used there. */
-#if defined(__sun) && defined(__svr4__)
+#if defined(__FreeBSD__) || (defined(__sun) && defined(__svr4__))
static volatile int __gthread_active = -1;
@@ -197,7 +200,7 @@
return __gthread_active_latest_value != 0;
}
-#else /* not Solaris */
+#else /* neither FreeBSD nor Solaris */
static inline int
__gthread_active_p (void)
@@ -207,7 +210,7 @@
return __gthread_active_ptr != 0;
}
-#endif /* Solaris */
+#endif /* FreeBSD or Solaris */
#else /* not SUPPORTS_WEAK */
==== //depot/projects/vap/contrib/netcat/FREEBSD-upgrade#3 (text+ko) ====
@@ -1,4 +1,4 @@
-$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.1 2005/02/06 15:26:44 delphij Exp $
+$FreeBSD: src/contrib/netcat/FREEBSD-upgrade,v 1.2 2008/04/21 18:37:08 delphij Exp $
1. Export from OpenBSD's nc(1) into an empty directory (say "v-nc").
2. while read pattern; do rm ${pattern} ; done < FREEBSD-Xlist
@@ -9,9 +9,11 @@
6. If there is conflicits, try to resolve them.
7. do build in f-nc/../../usr.bin/nc
8. If everything seems ok, do the actual import in v-nc:
- cvs -n import src/contrib/netcat OPENBSD OPENBSD_<date>
+ cvs -n import src/contrib/netcat OPENBSD OPENBSD_<release>
Everything appears be Ok? Do:
- cvs import src/contrib/netcat OPENBSD OPENBSD_<date>
+ cvs import src/contrib/netcat OPENBSD OPENBSD_<release>
+ (note: recently we import from OpenBSD's release branches
+ rather than importing -HEAD snapshots)
9. Resolve the conflicits with the patchset obtained in step 6.
-delphij@FreeBSD.org - 06 Feb 2005
+delphij@FreeBSD.org - 21 Apr 2008
==== //depot/projects/vap/contrib/netcat/atomicio.c#3 (text+ko) ====
@@ -1,7 +1,7 @@
-/* $OpenBSD: atomicio.c,v 1.8 2006/02/11 19:31:18 otto Exp $ */
-
+/* $OpenBSD: atomicio.c,v 1.9 2007/09/07 14:50:44 tobias Exp $ */
/*
- * Copyright (c) 2005 Anil Madhavapeddy. All rights served.
+ * Copyright (c) 2006 Damien Miller. All rights reserved.
+ * Copyright (c) 2005 Anil Madhavapeddy. All rights reserved.
* Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
* All rights reserved.
*
@@ -26,32 +26,37 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
-#include <sys/types.h>
-#include <sys/uio.h>
+#include <sys/param.h>
+
#include <errno.h>
+#include <poll.h>
#include <unistd.h>
+
#include "atomicio.h"
/*
* ensure all of data on socket comes through. f==read || f==vwrite
*/
size_t
-atomicio(f, fd, _s, n)
- ssize_t (*f) (int, void *, size_t);
- int fd;
- void *_s;
- size_t n;
+atomicio(ssize_t (*f) (int, void *, size_t), int fd, void *_s, size_t n)
{
char *s = _s;
size_t pos = 0;
ssize_t res;
+ struct pollfd pfd;
+ pfd.fd = fd;
+ pfd.events = f == read ? POLLIN : POLLOUT;
while (n > pos) {
res = (f) (fd, s + pos, n - pos);
switch (res) {
case -1:
- if (errno == EINTR || errno == EAGAIN)
+ if (errno == EINTR)
+ continue;
+ if (errno == EAGAIN) {
+ (void)poll(&pfd, 1, -1);
continue;
+ }
return 0;
case 0:
errno = EPIPE;
@@ -60,5 +65,5 @@
pos += (size_t)res;
}
}
- return pos;
+ return (pos);
}
==== //depot/projects/vap/contrib/netcat/atomicio.h#3 (text) ====
@@ -1,6 +1,7 @@
-/* $OpenBSD: atomicio.h,v 1.1 2005/05/24 20:13:28 avsm Exp $ */
+/* $OpenBSD: atomicio.h,v 1.2 2007/09/07 14:50:44 tobias Exp $ */
/*
+ * Copyright (c) 2006 Damien Miller. All rights reserved.
* Copyright (c) 1995,1999 Theo de Raadt. All rights reserved.
* All rights reserved.
*
@@ -25,9 +26,14 @@
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#ifndef _ATOMICIO_H
+#define _ATOMICIO_H
+
/*
* Ensure all of data on socket comes through. f==read || f==vwrite
*/
size_t atomicio(ssize_t (*)(int, void *, size_t), int, void *, size_t);
#define vwrite (ssize_t (*)(int, void *, size_t))write
+
+#endif /* _ATOMICIO_H */
==== //depot/projects/vap/contrib/netcat/nc.1#4 (text+ko) ====
@@ -1,4 +1,4 @@
-.\" $OpenBSD: nc.1,v 1.44 2006/12/02 01:08:30 jmc Exp $
+.\" $OpenBSD: nc.1,v 1.45 2007/05/31 19:20:13 jmc Exp $
.\"
.\" Copyright (c) 1996 David Sacerdote
.\" All rights reserved.
@@ -25,9 +25,9 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.8 2008/04/01 13:54:24 bms Exp $
+.\" $FreeBSD: src/contrib/netcat/nc.1,v 1.9 2008/04/21 18:31:50 delphij Exp $
.\"
-.Dd April 2, 2008
+.Dd $Mdocdate$
.Dt NC 1
.Os
.Sh NAME
==== //depot/projects/vap/etc/Makefile#5 (text+ko) ====
@@ -1,5 +1,5 @@
# from: @(#)Makefile 5.11 (Berkeley) 5/21/91
-# $FreeBSD: src/etc/Makefile,v 1.366 2008/03/05 18:32:58 brooks Exp $
+# $FreeBSD: src/etc/Makefile,v 1.367 2008/04/20 20:37:02 sam Exp $
.include <bsd.own.mk>
==== //depot/projects/vap/etc/defaults/rc.conf#10 (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.330 2008/04/08 23:50:03 emax Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.332 2008/04/21 18:17:48 brooks Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -33,7 +33,7 @@
apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO).
apmd_enable="NO" # Run apmd to handle APM event from userland.
apmd_flags="" # Flags to apmd (if enabled).
-ddb_enable="NO" # Set to YES to load ddb scripts at boot.
+ddb_enable="YES" # Load ddb scripts at boot.
ddb_config="/etc/ddb.conf" # ddb(8) config file.
devd_enable="YES" # Run devd, to trigger programs on device tree changes.
devd_flags="" # Additional flags for devd(8).
==== //depot/projects/vap/etc/network.subr#8 (text+ko) ====
@@ -22,7 +22,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/network.subr,v 1.182 2008/03/28 06:50:06 brooks Exp $
+# $FreeBSD: src/etc/network.subr,v 1.183 2008/04/20 20:37:20 sam Exp $
#
#
==== //depot/projects/vap/etc/rc.d/hostapd#4 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/hostapd,v 1.2 2007/11/14 21:19:15 brix Exp $
+# $FreeBSD: src/etc/rc.d/hostapd,v 1.3 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: hostapd
==== //depot/projects/vap/etc/rc.d/initrandom#3 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/initrandom,v 1.7 2007/05/24 05:58:20 rse Exp $
+# $FreeBSD: src/etc/rc.d/initrandom,v 1.8 2008/04/22 15:18:47 ru Exp $
#
# PROVIDE: initrandom
@@ -28,24 +28,26 @@
if [ \! -z "${soft_random_generator}" ] ; then
- if checkyesno harvest_interrupt; then
- if [ -w /dev/random ]; then
+ if [ -w /dev/random ]; then
+ if checkyesno harvest_interrupt; then
${SYSCTL_W} kern.random.sys.harvest.interrupt=1 >/dev/null
echo -n ' interrupts'
+ else
+ ${SYSCTL_W} kern.random.sys.harvest.interrupt=0 >/dev/null
fi
- fi
- if checkyesno harvest_ethernet; then
- if [ -w /dev/random ]; then
+ if checkyesno harvest_ethernet; then
${SYSCTL_W} kern.random.sys.harvest.ethernet=1 >/dev/null
echo -n ' ethernet'
+ else
+ ${SYSCTL_W} kern.random.sys.harvest.ethernet=0 >/dev/null
fi
- fi
- if checkyesno harvest_p_to_p; then
- if [ -w /dev/random ]; then
- ${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
+ if checkyesno harvest_p_to_p; then
+ ${SYSCTL_W} kern.random.sys.harvest.point_to_point=1 >/dev/null
echo -n ' point_to_point'
+ else
+ ${SYSCTL_W} kern.random.sys.harvest.point_to_point=0 >/dev/null
fi
fi
==== //depot/projects/vap/etc/rc.d/netif#7 (text+ko) ====
@@ -22,7 +22,7 @@
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#
-# $FreeBSD: src/etc/rc.d/netif,v 1.25 2008/01/26 11:22:12 mtm Exp $
+# $FreeBSD: src/etc/rc.d/netif,v 1.26 2008/04/20 20:37:20 sam Exp $
#
# PROVIDE: netif
==== //depot/projects/vap/etc/rc.d/wpa_supplicant#9 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh
#
-# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.5 2008/04/08 23:12:15 sam Exp $
+# $FreeBSD: src/etc/rc.d/wpa_supplicant,v 1.6 2008/04/20 20:37:21 sam Exp $
#
# PROVIDE: wpa_supplicant
==== //depot/projects/vap/lib/libc/stdio/fopen.c#5 (text+ko) ====
@@ -34,7 +34,7 @@
static char sccsid[] = "@(#)fopen.c 8.1 (Berkeley) 6/4/93";
#endif /* LIBC_SCCS and not lint */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.13 2008/02/27 21:25:19 jhb Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdio/fopen.c,v 1.14 2008/04/22 17:03:32 jhb Exp $");
#include "namespace.h"
#include <sys/types.h>
@@ -73,6 +73,7 @@
* open.
*/
if (f > SHRT_MAX) {
+ fp->_flags = 0; /* release */
_close(f);
errno = EMFILE;
return (NULL);
==== //depot/projects/vap/lib/libc/sys/cpuset.2#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.1 2008/03/29 10:06:30 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -36,6 +36,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset "cpusetid_t *setid"
==== //depot/projects/vap/lib/libc/sys/cpuset_getaffinity.2#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.1 2008/03/29 10:26:29 jeff Exp $
+.\" $FreeBSD: src/lib/libc/sys/cpuset_getaffinity.2,v 1.2 2008/04/20 15:51:56 antoine Exp $
.\"
.Dd March 29, 2008
.Dt CPUSET 2
@@ -35,6 +35,7 @@
.Sh LIBRARY
.Lb libc
.Sh SYNOPSIS
+.In sys/param.h
.In sys/cpuset.h
.Ft int
.Fn cpuset_getaffinity "cpulevel_t level" "cpuwhich_t which" "id_t id" "size_t setsize" "cpuset_t *mask"
==== //depot/projects/vap/lib/libthr/thread/thr_rtld.c#5 (text) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.7 2008/04/02 07:41:24 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_rtld.c,v 1.8 2008/04/22 06:44:11 davidxu Exp $
*
*/
@@ -40,8 +40,6 @@
extern int errno;
#define CACHE_LINE_SIZE 64
-#define WAFLAG 0x1
-#define RC_INCR 0x2
static int _thr_rtld_clr_flag(int);
static void *_thr_rtld_lock_create(void);
@@ -52,11 +50,7 @@
static void _thr_rtld_wlock_acquire(void *);
struct rtld_lock {
- volatile int lock;
- volatile int rd_waiters;
- volatile int wr_waiters;
- volatile long rd_cv;
- volatile long wr_cv;
+ struct urwlock lock;
void *base;
};
@@ -67,19 +61,22 @@
char *p;
uintptr_t r;
struct rtld_lock *l;
+ size_t size;
- THR_ASSERT(sizeof(struct rtld_lock) <= CACHE_LINE_SIZE,
- "rtld_lock too large");
- base = calloc(1, CACHE_LINE_SIZE);
+ size = CACHE_LINE_SIZE;
+ while (size < sizeof(struct rtld_lock))
+ size <<= 1;
+ base = calloc(1, size);
p = (char *)base;
if ((uintptr_t)p % CACHE_LINE_SIZE != 0) {
free(base);
- base = calloc(1, 2 * CACHE_LINE_SIZE);
+ base = calloc(1, size + CACHE_LINE_SIZE);
p = (char *)base;
if ((r = (uintptr_t)p % CACHE_LINE_SIZE) != 0)
p += CACHE_LINE_SIZE - r;
}
l = (struct rtld_lock *)p;
+ l->lock.rw_flags = URWLOCK_PREFER_READER;
l->base = base;
return (l);
}
@@ -110,7 +107,6 @@
{
struct pthread *curthread;
struct rtld_lock *l;
- long v;
int errsave;
curthread = _get_curthread();
@@ -118,18 +114,8 @@
l = (struct rtld_lock *)lock;
THR_CRITICAL_ENTER(curthread);
- atomic_add_acq_int(&l->lock, RC_INCR);
- if (!(l->lock & WAFLAG)) {
- RESTORE_ERRNO();
- return;
- }
- v = l->rd_cv;
- atomic_add_int(&l->rd_waiters, 1);
- while (l->lock & WAFLAG) {
- _thr_umtx_wait(&l->rd_cv, v, NULL);
- v = l->rd_cv;
- }
- atomic_add_int(&l->rd_waiters, -1);
+ while (_thr_rwlock_rdlock(&l->lock, 0, NULL) != 0)
+ ;
RESTORE_ERRNO();
}
@@ -138,7 +124,6 @@
{
struct pthread *curthread;
struct rtld_lock *l;
- long v;
int errsave;
curthread = _get_curthread();
@@ -146,19 +131,9 @@
l = (struct rtld_lock *)lock;
_thr_signal_block(curthread);
- for (;;) {
- if (atomic_cmpset_acq_int(&l->lock, 0, WAFLAG)) {
- RESTORE_ERRNO();
- return;
- }
- v = l->wr_cv;
- atomic_add_int(&l->wr_waiters, 1);
- while (l->lock != 0) {
- _thr_umtx_wait(&l->wr_cv, v, NULL);
- v = l->wr_cv;
- }
- atomic_add_int(&l->wr_waiters, -1);
- }
+ while (_thr_rwlock_wrlock(&l->lock, NULL) != 0)
+ ;
+ RESTORE_ERRNO();
}
static void
@@ -166,29 +141,20 @@
{
struct pthread *curthread;
struct rtld_lock *l;
+ int32_t state;
int errsave;
curthread = _get_curthread();
SAVE_ERRNO();
l = (struct rtld_lock *)lock;
- if ((l->lock & WAFLAG) == 0) {
- atomic_add_rel_int(&l->lock, -RC_INCR);
- if (l->lock == 0 && l->wr_waiters) {
- atomic_add_long(&l->wr_cv, 1);
- _thr_umtx_wake(&l->wr_cv, l->wr_waiters);
+ state = l->lock.rw_state;
+ if (_thr_rwlock_unlock(&l->lock) == 0) {
+ if ((state & URWLOCK_WRITE_OWNER) == 0) {
+ THR_CRITICAL_LEAVE(curthread);
+ } else {
+ _thr_signal_unblock(curthread);
}
- THR_CRITICAL_LEAVE(curthread);
- } else {
- atomic_add_rel_int(&l->lock, -WAFLAG);
- if (l->lock == 0 && l->wr_waiters) {
- atomic_add_long(&l->wr_cv, 1);
- _thr_umtx_wake(&l->wr_cv, l->wr_waiters);
- } else if (l->rd_waiters) {
- atomic_add_long(&l->rd_cv, 1);
- _thr_umtx_wake(&l->rd_cv, l->rd_waiters);
- }
- _thr_signal_unblock(curthread);
}
RESTORE_ERRNO();
}
==== //depot/projects/vap/lib/libutil/Makefile#3 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/libutil/Makefile,v 1.66 2007/09/01 06:19:11 pjd Exp $
+# $FreeBSD: src/lib/libutil/Makefile,v 1.67 2008/04/23 00:49:12 scf Exp $
SHLIBDIR?= /lib
@@ -8,7 +8,7 @@
LIB= util
SHLIB_MAJOR= 7
-SRCS= _secure_path.c auth.c expand_number.c flopen.c fparseln.c \
+SRCS= _secure_path.c auth.c gr_util.c expand_number.c flopen.c fparseln.c \
humanize_number.c kld.c login.c login_auth.c login_cap.c login_class.c \
login_crypt.c login_ok.c login_times.c login_tty.c logout.c \
logwtmp.c pidfile.c property.c pty.c pw_util.c realhostname.c \
==== //depot/projects/vap/lib/libutil/libutil.h#3 (text+ko) ====
@@ -33,7 +33,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libutil/libutil.h,v 1.46 2007/11/18 02:20:02 jb Exp $
+ * $FreeBSD: src/lib/libutil/libutil.h,v 1.47 2008/04/23 00:49:12 scf Exp $
*/
#ifndef _LIBUTIL_H_
@@ -119,6 +119,13 @@
int pw_tmp(int _mfd);
#endif
+#ifdef _GRP_H_
+int gr_equal(const struct group *gr1, const struct group *gr2);
+char *gr_make(const struct group *gr);
+struct group *gr_dup(const struct group *gr);
+struct group *gr_scan(const char *line);
+#endif
+
#ifdef _SYS_PARAM_H_
struct pidfh *pidfile_open(const char *path, mode_t mode, pid_t *pidptr);
int pidfile_write(struct pidfh *pfh);
==== //depot/projects/vap/release/amd64/boot_crunch.conf#4 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.62 2008/01/22 16:35:08 kensmith Exp $
+# $FreeBSD: src/release/amd64/boot_crunch.conf,v 1.63 2008/04/22 18:20:03 thompsa Exp $
buildopts -DRELEASE_CRUNCH -Dlint
@@ -44,3 +44,4 @@
libs -ll -ledit -lutil -lmd -lcrypt -lftpio -lz -lnetgraph
libs -ldialog -lncurses -ldisk -lcam -lsbuf -lufs -ldevinfo
+libs -lbsdxml
==== //depot/projects/vap/release/doc/en_US.ISO8859-1/hardware/article.sgml#5 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Wed Apr 23 12:27:06 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3AF5D1065673; Wed, 23 Apr 2008 12:27:06 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id EA7F7106566C
for <perforce@freebsd.org>; Wed, 23 Apr 2008 12:27:05 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id CC11C8FC13
for <perforce@freebsd.org>; Wed, 23 Apr 2008 12:27:05 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3NCR5Iq095313
for <perforce@freebsd.org>; Wed, 23 Apr 2008 12:27:05 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3NCR5VZ095311
for perforce@freebsd.org; Wed, 23 Apr 2008 12:27:05 GMT
(envelope-from gabor@freebsd.org)
Date: Wed, 23 Apr 2008 12:27:05 GMT
Message-Id: <200804231227.m3NCR5VZ095311@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140458 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2008 12:27:06 -0000
http://perforce.freebsd.org/chv.cgi?CH=140458
Change 140458 by gabor@gabor_server on 2008/04/23 12:26:32
- Create a branch for the Spanish Documentation Project. Here will we
update and extend our translation set.
Affected files ...
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/mk/doc.local.mk#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/authors.ent#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/bookinfo.ent#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/freebsd.dsl#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/l10n.ent#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/legalnotice.sgml#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/mailing-lists.ent#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/newsgroups.ent#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/teams.ent#1 branch
.. //depot/projects/docproj_es/doc/en_US.ISO8859-1/share/sgml/trademarks.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/FAQ.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/acknowledgments.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/admin.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/applications.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/commercial.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/hackers.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/hardware.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/includes.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/install.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/kernelconfig.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/misc.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/network.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/preface.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/serial.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/troubleshoot.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/FAQ/x.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/Makefile.inc#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/casestudy-argentina.com/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/contributing/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/contributing/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/cvs-freebsd/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/cvs-freebsd/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/dialup-firewall/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/dialup-firewall/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/euro/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/euro/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/explaining-bsd/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/explaining-bsd/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_1.sh#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_2.sh#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/fbsd-from-scratch/fase_3.mk#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/fdp-es/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/fdp-es/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/laptop/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/laptop/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/linux-comparison/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/linux-comparison/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/mailing-list-faq/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/mailing-list-faq/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/nanobsd/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/nanobsd/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/p4-primer/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/p4-primer/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/problem-reports/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/problem-reports/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/releng/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/releng/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/releng/extra.css#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/version-guide/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/version-guide/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/zip-drive/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/zip-drive/article.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/Makefile.inc#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/faq/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/faq/book.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/advanced-networking/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/appendix.decl#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/audit/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/authors.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/backups/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/basics/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/bibliography/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/book.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/boot/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/chapter.decl#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/chapters.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/colophon.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/config/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/contrib/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/cutting-edge/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/desktop/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/disks/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/eresources/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/firewalls/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/firewalls/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/geom/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/hw/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/install/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/internals/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/introduction/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/jails/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/kernelconfig/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/kerneldebug/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/kernelopts/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/l10n/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/linuxemu/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/mac/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/mail/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/mirrors/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/multimedia/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/network-servers/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/newsgroups.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/pgpkeys/pgpkeys.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/policies/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/ports/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/ppp-and-slip/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/preface/preface.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/printing/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/quotas/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/security/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/serialcomms/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/staff/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/txtfiles.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/users/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/vinum/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/virtualization/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/books/handbook/x11/chapter.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/flyer/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/flyer/flyer.tex#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/articles.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/bookinfo.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/books.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/catalog#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/es-mailing-lists.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/glossary/freebsd-glossary.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/l10n.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/legalnotice.sgml#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/mailing-lists.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/newsgroups.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/teams.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/trademarks.ent#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/translators.ent#1 branch
.. //depot/projects/docproj_es/doc/share/examples/add-manref.sh#1 branch
.. //depot/projects/docproj_es/doc/share/examples/check-manref.sh#1 branch
.. //depot/projects/docproj_es/doc/share/examples/vim/accents-sgml.vim#1 branch
.. //depot/projects/docproj_es/doc/share/examples/vim/accents2sgml.pl#1 branch
.. //depot/projects/docproj_es/doc/share/examples/vim/edit-sgml.vim#1 branch
.. //depot/projects/docproj_es/doc/share/examples/vim/gvimrc-sample#1 branch
.. //depot/projects/docproj_es/doc/share/examples/vim/sgml2accents.pl#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/building-products/freebsd-branches.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/building-products/freebsd-organization.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/checkpoint/networks.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/console-server/tk0231-9-1.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/releng/branches-head.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/releng/branches-releng3.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/releng/branches-releng4.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/releng/branches-releng5.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/releng/branches-releng6.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/vinum/ad0b4aft.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/vinum/ad2b4aft.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/vinum/arch.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/vm-design/fig1.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/vm-design/fig2.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/vm-design/fig3.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/articles/vm-design/fig4.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/corp-net-guide/08-01.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/corp-net-guide/08-02.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/corp-net-guide/08-03.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/corp-net-guide/08-04.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/corp-net-guide/08-05.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/corp-net-guide/08-06.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/design-44bsd/fig1.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/design-44bsd/fig2.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/branches.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/branches.sla#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/freebsd-code-model.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/hats-overview.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/maintenance.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/orghierarchy.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/orghierarchy.sla#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/orghierarchy2.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/portsstatus.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/proc-add-committer.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/proc-add-cvsup.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/proc-commit.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/proc-contrib.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/proc-elections.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/proc-pr.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/proc-releng.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/dev-model/proc-rm-committer.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/developers-handbook/sockets/layers.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/developers-handbook/sockets/sain.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/developers-handbook/sockets/sainfill.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/developers-handbook/sockets/sainlsb.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/developers-handbook/sockets/sainmsb.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/developers-handbook/sockets/sainserv.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/developers-handbook/sockets/serv.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/developers-handbook/sockets/serv2.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/developers-handbook/sockets/slayers.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/advanced-networking/isdn-bus.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/advanced-networking/isdn-twisted-pair.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/advanced-networking/natd.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/advanced-networking/net-routing.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/advanced-networking/static-routes.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/geom/striping.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/adduser1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/adduser2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/adduser3.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/boot-loader-menu.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/boot-mgr.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/config-country.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/console-saver1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/console-saver2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/console-saver3.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/console-saver4.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/desktop.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/disk-layout.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/disklabel-auto.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/disklabel-ed1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/disklabel-ed2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/disklabel-fs.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/disklabel-root1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/disklabel-root2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/disklabel-root3.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/dist-set.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/dist-set2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/docmenu1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/ed0-conf.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/ed0-conf2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/edit-inetd-conf.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/example-dir1.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/example-dir2.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/example-dir3.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/example-dir4.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/example-dir5.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/fdisk-drive1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/fdisk-drive2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/fdisk-edit1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/fdisk-edit2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/ftp-anon1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/ftp-anon2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/hdwrconf.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/keymap.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/main-doc.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/main-keymap.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/main-options.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/main-std.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/main1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/mainexit.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/media.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/mouse1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/mouse2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/mouse3.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/mouse4.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/mouse5.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/mouse6.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/mta-main.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/net-config-menu1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/net-config-menu2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/nfs-server-edit.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/ntp-config.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/options.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/pkg-cat.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/pkg-confirm.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/pkg-install.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/pkg-sel.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/probstart.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/routed.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/security.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/sysinstall-exit.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/timezone1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/timezone2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/timezone3.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/userconfig.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/userconfig2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/install/xf86setup.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/mail/mutt1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/mail/mutt2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/mail/mutt3.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/mail/pine1.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/mail/pine2.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/mail/pine3.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/mail/pine4.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/mail/pine5.scr#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/security/ipsec-crypt-pkt.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/security/ipsec-encap-pkt.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/security/ipsec-network.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/security/ipsec-out-pkt.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/vinum/vinum-concat.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/vinum/vinum-mirrored-vol.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/vinum/vinum-raid10-vol.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/vinum/vinum-raid5-org.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/vinum/vinum-simple-vol.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/vinum/vinum-striped-vol.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/vinum/vinum-striped.pic#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd1.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd10.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd11.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd12.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd13.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd2.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd3.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd4.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd5.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd6.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd7.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd8.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/parallels-freebsd9.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd1.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd10.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd11.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd12.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd13.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd2.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd3.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd4.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd5.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd6.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd7.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd8.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/virtualpc-freebsd9.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd01.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd02.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd03.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd04.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd05.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd06.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd07.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd08.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd09.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd10.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd11.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/books/handbook/virtualization/vmware-freebsd12.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/1.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/10.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/11.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/12.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/13.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/14.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/15.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/2.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/3.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/4.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/5.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/6.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/7.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/8.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/callouts/9.png#1 branch
.. //depot/projects/docproj_es/doc/share/images/flyer/beastie.eps#1 branch
.. //depot/projects/docproj_es/doc/share/images/flyer/logo-full.png#1 branch
.. //depot/projects/docproj_es/doc/share/misc/docbook.css#1 branch
.. //depot/projects/docproj_es/doc/share/misc/epsgeom#1 branch
.. //depot/projects/docproj_es/doc/share/misc/indexreport.pl#1 branch
.. //depot/projects/docproj_es/doc/share/mk/doc.common.mk#1 branch
.. //depot/projects/docproj_es/doc/share/mk/doc.docbook.mk#1 branch
.. //depot/projects/docproj_es/doc/share/mk/doc.html.mk#1 branch
.. //depot/projects/docproj_es/doc/share/mk/doc.images.mk#1 branch
.. //depot/projects/docproj_es/doc/share/mk/doc.install.mk#1 branch
.. //depot/projects/docproj_es/doc/share/mk/doc.project.mk#1 branch
.. //depot/projects/docproj_es/doc/share/mk/doc.slides.mk#1 branch
.. //depot/projects/docproj_es/doc/share/mk/doc.subdir.mk#1 branch
.. //depot/projects/docproj_es/doc/share/mk/doc.xml.mk#1 branch
.. //depot/projects/docproj_es/doc/share/openoffice/BSDi.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/openoffice/BSDi/META-INF/manifest.xml#1 branch
.. //depot/projects/docproj_es/doc/share/openoffice/BSDi/Pictures/10000000000004220000031AEAC840AF.png#1 branch
.. //depot/projects/docproj_es/doc/share/openoffice/BSDi/meta.xml#1 branch
.. //depot/projects/docproj_es/doc/share/openoffice/BSDi/mimetype#1 branch
.. //depot/projects/docproj_es/doc/share/openoffice/BSDi/settings.xml#1 branch
.. //depot/projects/docproj_es/doc/share/openoffice/BSDi/styles.xml#1 branch
.. //depot/projects/docproj_es/doc/share/openoffice/include.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/README#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/aaron.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ache.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/acm.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/adamw.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/addkey.sh#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ahze.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ale.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/alepulver.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/alex.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/alexbl.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/anders.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/andreas.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/anholt.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/anray.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/antoine.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/araujo.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ariff.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/arun.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/arved.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/asami.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/avatar.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bakul.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/barner.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/beech.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ben.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/benjsc.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/benno.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/billf.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/blackend.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bland.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bmah.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bms.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/brd.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/brian.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/brix.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/brooks.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/brueffer.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bruno.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bsam.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bsd.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bushman.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bvs.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/bz.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/cel.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ceri.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/chinsan.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/cjc.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/cjh.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/clement.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/clive.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/clsung.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/cokane.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/core-secretary.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/cperciva.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/cshumway.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/daichi.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/damien.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/danfe.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/danger.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/dannyboy.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/das.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/davidxu.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/db.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/dcs.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/dd.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/delphij.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/demon.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/den.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/des.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/dfr.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/dhartmei.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/dinoex.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/dougb.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/dryice.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/dwmalone.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ehaupt.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/emax.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/erwin.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/fanf.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/farrokhi.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/fjoe.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/flz.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/foxfair.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/gabor.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/gahr.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ganbold.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/garga.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/garys.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/gerald.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ghelmer.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/gioria.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/glebius.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/glewis.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/gnn.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/gordon.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/green.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/grehan.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/gshapiro.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/gsutter.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/guido.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/harti.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/hmp.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/hq.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/hrs.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ijliao.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/imp.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/itetcu.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jadawin.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jcamou.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jdp.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jedgar.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jesper.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jhay.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jhb.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jim.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jinmei.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jkh.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jkim.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jkois.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jkoshy.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jmb.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jmelo.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jmg.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/joe.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/joerg.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/johans.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jon.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/josef.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/jylefort.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/kaiw.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ken.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/kensmith.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/keramida.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/keyring.pl#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/kib.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/knu.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/koitsu.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/krion.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/kris.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/kuriyama.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/kwm.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/laszlof.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lawrance.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lbr.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/le.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/leeym.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lesi.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/linimon.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lioux.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lippe.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lme.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/loader.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lofi.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lth.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lulf.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/luoqi.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lwhsu.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/lx.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/maho.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/marcel.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/marck.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/marcus.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/marius.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/markp.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/marks.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/markus.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mat.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/matteo.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/matusita.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mav.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/max.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/maxim.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mbr.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/metal.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mheinen.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mi.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mich.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mikeh.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/miwi.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mlaier.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mm.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mnag.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mp.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mtm.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/murray.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/mux.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/nate.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/nectar.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/nemoliu.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/netchild.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/niels.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/nik.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/niklas.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/nivit.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/njl.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/nork.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/novel.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/nox.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/nsouch.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/nyan.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/obraun.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/obrien.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/oleg.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/patrick.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/paul.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pav.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/peadar.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/perky.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/petef.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/peter.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgj.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys-core.sgml#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys-developers.sgml#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys-officers.sgml#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pgpkeys.ent#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/phantom.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/philip.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/phk.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pirzyk.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/pjd.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/portmgr-secretary.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rafan.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rdivacky.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rees.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/remko.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rich.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rik.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rink.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/roam.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/roberto.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rodrigc.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rpaulo.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rrs.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ru.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/rushani.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/sam.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/sanpei.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/sat.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/schweikh.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/scop.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/scottl.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/seanc.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/security-officer.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/sem.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/sephe.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/sepotvin.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/sergei.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/shaun.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/sheldonh.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/simon.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/sobomax.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ssouhlal.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/stas.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/stefan.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/stefanf.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/stephane.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/syrinx.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/tabthorpe.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/tdb.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/thierry.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/thomas.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/thompsa.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/timur.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/tmclaugh.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/tmm.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/tobez.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/trasz.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/trevor.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/trhodes.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/twinterg.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ue.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ume.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/ups.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/vanilla.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/vd.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/viny.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/vkashyap.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/vs.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/vsevolod.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/weongyo.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/wes.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/wilko.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/will.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/wkoszek.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/wollman.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/wosch.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/wxs.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/xride.key#1 branch
.. //depot/projects/docproj_es/doc/share/pgpkeys/yoichi.key#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/README.mirrors#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/articles.ent#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/bibliography.sgml#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/books.ent#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/catalog#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/default.dsl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/freebsd.dsl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/freebsd.dtd#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/freebsd.ent#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/freebsd41.dtd#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/l10n.ent#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/man-refs.ent#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/man-refs.pl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/mirrors-local.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/mirrors-master.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/mirrors.xml#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/pgp.dsl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/spellcheck.dsl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/trademarks.ent#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/transtable-common.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/transtable-local.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/transtable-master.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/transtable.xml#1 branch
.. //depot/projects/docproj_es/doc/share/sgml/urls.ent#1 branch
.. //depot/projects/docproj_es/doc/share/web2c/pdftex.def#1 branch
.. //depot/projects/docproj_es/doc/share/xsl/default.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/xsl/freebsd-common.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/xsl/freebsd-fo.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/xsl/freebsd-html-chunk.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/xsl/freebsd-html.xsl#1 branch
.. //depot/projects/docproj_es/doc/share/xsl/freebsd.xsl#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/Makefile#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/errata/Makefile#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/errata/article.sgml#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/hardware/Makefile#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/hardware/article.sgml#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/readme/Makefile#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/readme/article.sgml#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/relnotes/Makefile#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch
.. //depot/projects/docproj_es/src/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#1 branch
.. //depot/projects/docproj_es/src/release/doc/share/examples/Makefile.relnotesng#1 branch
.. //depot/projects/docproj_es/src/release/doc/share/misc/dev.archlist.txt#1 branch
.. //depot/projects/docproj_es/src/release/doc/share/misc/man2hwnotes.pl#1 branch
.. //depot/projects/docproj_es/src/release/doc/share/mk/doc.relnotes.mk#1 branch
.. //depot/projects/docproj_es/src/release/doc/share/sgml/Makefile#1 branch
.. //depot/projects/docproj_es/src/release/doc/share/sgml/catalog#1 branch
.. //depot/projects/docproj_es/src/release/doc/share/sgml/default.dsl#1 branch
.. //depot/projects/docproj_es/src/release/doc/share/sgml/release.dsl#1 branch
.. //depot/projects/docproj_es/src/release/doc/share/sgml/release.ent#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/Makefile#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/errata/Makefile#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/errata/article.sgml#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/hardware/Makefile#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/hardware/article.sgml#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/readme/Makefile#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/readme/article.sgml#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/relnotes/Makefile#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/relnotes/article.sgml#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/share/sgml/catalog#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/en_US.ISO8859-1/share/sgml/release.dsl#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/share/examples/Makefile.relnotesng#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/share/misc/dev.archlist.txt#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/share/misc/man2hwnotes.pl#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/share/mk/doc.relnotes.mk#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/share/sgml/Makefile#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/share/sgml/catalog#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/share/sgml/default.dsl#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/share/sgml/release.dsl#1 branch
.. //depot/projects/docproj_es/src_7/release/doc/share/sgml/release.ent#1 branch
.. //depot/projects/docproj_es/www/en/FAQ/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/FAQ/index.html#1 branch
.. //depot/projects/docproj_es/www/en/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/Makefile.inc#1 branch
.. //depot/projects/docproj_es/www/en/about.sgml#1 branch
.. //depot/projects/docproj_es/www/en/administration.sgml#1 branch
.. //depot/projects/docproj_es/www/en/advocacy/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/advocacy/index.sgml#1 branch
.. //depot/projects/docproj_es/www/en/advocacy/letter.sgml#1 branch
.. //depot/projects/docproj_es/www/en/advocacy/myths.sgml#1 branch
.. //depot/projects/docproj_es/www/en/applications.sgml#1 branch
.. //depot/projects/docproj_es/www/en/art.sgml#1 branch
.. //depot/projects/docproj_es/www/en/availability.sgml#1 branch
.. //depot/projects/docproj_es/www/en/cgi/Gnats.pm#1 branch
.. //depot/projects/docproj_es/www/en/cgi/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/cgi/cgi-lib.pl#1 branch
.. //depot/projects/docproj_es/www/en/cgi/cgi-style.pl#1 branch
.. //depot/projects/docproj_es/www/en/cgi/confirm-code.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/cvsweb.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/cvsweb.conf#1 branch
.. //depot/projects/docproj_es/www/en/cgi/cvsweb.conf-freebsd#1 branch
.. //depot/projects/docproj_es/www/en/cgi/dosendpr.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/getmsg.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/mailindex.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/man.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/mid.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/mirror.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/missing_handler.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/monthly.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/pds.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/ports.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/query-pr-lib.pl#1 branch
.. //depot/projects/docproj_es/www/en/cgi/query-pr-summary.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/query-pr.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/search.cgi#1 branch
.. //depot/projects/docproj_es/www/en/cgi/url.cgi#1 branch
.. //depot/projects/docproj_es/www/en/commercial/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/commercial/commercial.sgml#1 branch
.. //depot/projects/docproj_es/www/en/community.xsl#1 branch
.. //depot/projects/docproj_es/www/en/community/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/community/irc.sgml#1 branch
.. //depot/projects/docproj_es/www/en/community/mailinglists.sgml#1 branch
.. //depot/projects/docproj_es/www/en/community/newsgroups.sgml#1 branch
.. //depot/projects/docproj_es/www/en/community/webresources.sgml#1 branch
.. //depot/projects/docproj_es/www/en/copyright/COPYING#1 branch
.. //depot/projects/docproj_es/www/en/copyright/COPYING.LIB#1 branch
.. //depot/projects/docproj_es/www/en/copyright/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/copyright/copyright.sgml#1 branch
.. //depot/projects/docproj_es/www/en/copyright/daemon.sgml#1 branch
.. //depot/projects/docproj_es/www/en/copyright/freebsd-doc-license.sgml#1 branch
.. //depot/projects/docproj_es/www/en/copyright/freebsd-license.sgml#1 branch
.. //depot/projects/docproj_es/www/en/copyright/license.sgml#1 branch
.. //depot/projects/docproj_es/www/en/copyright/trademarks.sgml#1 branch
.. //depot/projects/docproj_es/www/en/developers.sgml#1 branch
.. //depot/projects/docproj_es/www/en/developers/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/developers/cvs.sgml#1 branch
.. //depot/projects/docproj_es/www/en/doc/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/docproj/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/docproj/current.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docproj/doc-set.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docproj/docproj.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docproj/handbook.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docproj/handbook3.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docproj/sgml.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docproj/submitting.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docproj/todo.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docproj/translations.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docproj/who.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docs.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docs/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/docs/books.sgml#1 branch
.. //depot/projects/docproj_es/www/en/docs/webresources.sgml#1 branch
.. //depot/projects/docproj_es/www/en/donations/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/donations/donors.sgml#1 branch
.. //depot/projects/docproj_es/www/en/donations/index.sgml#1 branch
.. //depot/projects/docproj_es/www/en/donations/wantlist.sgml#1 branch
.. //depot/projects/docproj_es/www/en/events/2002/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/events/2002/bsdcon-devsummit.sgml#1 branch
.. //depot/projects/docproj_es/www/en/events/2002/usenix-devsummit.sgml#1 branch
.. //depot/projects/docproj_es/www/en/events/2003/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/events/2003/bsdcon-devsummit.sgml#1 branch
.. //depot/projects/docproj_es/www/en/events/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/events/Makefile.inc#1 branch
.. //depot/projects/docproj_es/www/en/events/events.css#1 branch
.. //depot/projects/docproj_es/www/en/events/rss.xsl#1 branch
.. //depot/projects/docproj_es/www/en/favicon.ico#1 branch
.. //depot/projects/docproj_es/www/en/features.sgml#1 branch
.. //depot/projects/docproj_es/www/en/freebsd.css#1 branch
.. //depot/projects/docproj_es/www/en/gifs/2.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/205-jp.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/205-jpb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/3.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/4.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/5.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/6.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/7.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/8.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/9.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/A.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/B.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/C.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/D.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/E.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/F.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/G.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/H.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/J.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/K.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/L.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/M.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/Makefile#1 branch
.. //depot/projects/docproj_es/www/en/gifs/N.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/P.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/Q.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/R.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/S.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/T.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/U.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/V.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/W.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/X.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/Y.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/Z.pnm#1 branch
.. //depot/projects/docproj_es/www/en/gifs/aboutf.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/aboutfb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/abs_bsd_cov.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/apache.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/apachepower.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/back.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/banner1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/banner2.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/banner3.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/banner4.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bar.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/binary.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/blocked.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/branches.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/branches.tex#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bsdcomp-4.2.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bsdi-handbook.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bsdisc.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bsdiscb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bsdm.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bsdmagazine.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bsdmb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bug.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/building_internet_servers.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/building_internet_servers_small.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/bukudepan.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/c99.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/cahiers_adm_cov.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/comp_b.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/complete.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/cover.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/coverb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/dae_up2.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/dae_up3.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/daemon-phk.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/daemon.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/daemon_hammer-tn15.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/daemon_hammer-tn20.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/daemon_hammer-tn25.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/daemon_hammer.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/darbylogo.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/dir.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/doc.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/doc.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/docs0.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/docs1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/done.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/faq0.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/faq1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/fbsd-ososfypc.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/fbsdcng-english.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/fbsdcng-japanese.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/fhp_mini.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/flash0.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/flash1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/fm-freebsd45.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/freebsd-advert.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/freebsd-basics-cover-front-145.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/freebsd_1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/freebsd_3.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/freebsdro.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/frowny.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/fullcourse3.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/fullcourse3b.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/fultus-cover.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/get0.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/get1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/getstarb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/getstart.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/gourchin3.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/handboo0.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/handboo1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/home.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/how_to_contribute.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/in_progress.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/index0.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/index1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/instman.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/instmanb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/jp.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/jpb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/kapak.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/kapak_sml.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/kr.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/krb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/las5.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/las512.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/las512b.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/las523.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/las523b.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/las5b.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/littlelogo.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/lob-freebsd-4.2.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/lob-freebsd-4.4-small.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/lob-freebsd-4.4.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/lynx.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/mall_title_medium.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/mall_title_tiny.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/minigraph.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/new.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/news.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/news.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/newslet2.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/newslet2b.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/newsletb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/newslett.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/not_planned.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/not_started.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/pbfbsd2.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/pc98-jp.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/pc98-jpb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/pf_packet_filter_book_cover.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/pht.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/phtb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/plain.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/plueschtier-tiny.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/power-button.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/power.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/powerani.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/powerlogo.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/project_goal.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/project_plan.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/rbsdc-2007-01-cover-01.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/releases.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/resources_and_links.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/running.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/runningb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/sam.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/samb.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/search0.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/search1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/smart-reseller-small.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/smart-reseller.jpg#1 branch
.. //depot/projects/docproj_es/www/en/gifs/smiley.png#1 branch
.. //depot/projects/docproj_es/www/en/gifs/soft0.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/soft1.gif#1 branch
.. //depot/projects/docproj_es/www/en/gifs/starkit.jpg#1 branch
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Wed Apr 23 14:08:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 8C2611065677; Wed, 23 Apr 2008 14:08:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 4E171106566B
for <perforce@freebsd.org>; Wed, 23 Apr 2008 14:08:56 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 1484B8FC21
for <perforce@freebsd.org>; Wed, 23 Apr 2008 14:08:56 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3NE8tLa012120
for <perforce@freebsd.org>; Wed, 23 Apr 2008 14:08:55 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3NE8tbl012118
for perforce@freebsd.org; Wed, 23 Apr 2008 14:08:55 GMT
(envelope-from gabor@freebsd.org)
Date: Wed, 23 Apr 2008 14:08:55 GMT
Message-Id: <200804231408.m3NE8tbl012118@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140459 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2008 14:08:56 -0000
http://perforce.freebsd.org/chv.cgi?CH=140459
Change 140459 by gabor@gabor_server on 2008/04/23 14:08:49
- Add a "README" about the using of the Spanish repository
Affected files ...
.. //depot/projects/docproj_es/LEEME#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Wed Apr 23 14:31:21 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 035A6106567D; Wed, 23 Apr 2008 14:31:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B98D31065676
for <perforce@freebsd.org>; Wed, 23 Apr 2008 14:31:20 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 981ED8FC14
for <perforce@freebsd.org>; Wed, 23 Apr 2008 14:31:20 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3NEVKcn013018
for <perforce@freebsd.org>; Wed, 23 Apr 2008 14:31:20 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3NEVK6H013016
for perforce@freebsd.org; Wed, 23 Apr 2008 14:31:20 GMT
(envelope-from gabor@freebsd.org)
Date: Wed, 23 Apr 2008 14:31:20 GMT
Message-Id: <200804231431.m3NEVK6H013016@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140461 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2008 14:31:21 -0000
http://perforce.freebsd.org/chv.cgi?CH=140461
Change 140461 by gabor@gabor_server on 2008/04/23 14:30:40
- Add raw copy of the English release notes here. We will translate
them here.
Affected files ...
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/Makefile#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/Makefile#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/article.sgml#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/hardware/Makefile#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/hardware/article.sgml#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/readme/Makefile#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/readme/article.sgml#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/relnotes/Makefile#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/relnotes/article.sgml#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/share/sgml/catalog#1 add
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/share/sgml/release.dsl#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Wed Apr 23 16:43:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 57FFC1065674; Wed, 23 Apr 2008 16:43:46 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1A6291065672
for <perforce@FreeBSD.org>; Wed, 23 Apr 2008 16:43:46 +0000 (UTC)
(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id D0A0C8FC1A
for <perforce@FreeBSD.org>; Wed, 23 Apr 2008 16:43:45 +0000 (UTC)
(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3NGhjR9026772
for <perforce@FreeBSD.org>; Wed, 23 Apr 2008 16:43:45 GMT
(envelope-from diego@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3NGhjgd026770
for perforce@freebsd.org; Wed, 23 Apr 2008 16:43:45 GMT
(envelope-from diego@FreeBSD.org)
Date: Wed, 23 Apr 2008 16:43:45 GMT
Message-Id: <200804231643.m3NGhjgd026770@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
diego@FreeBSD.org using -f
From: Diego Giagio <diego@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140464 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2008 16:43:46 -0000
http://perforce.freebsd.org/chv.cgi?CH=140464
Change 140464 by diego@black on 2008/04/23 16:43:13
Project description added.
Affected files ...
.. //depot/projects/soc2008/diego-audit/README#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Wed Apr 23 21:36:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 50D971065675; Wed, 23 Apr 2008 21:36:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 125151065673
for <perforce@freebsd.org>; Wed, 23 Apr 2008 21:36:00 +0000 (UTC)
(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id E986C8FC13
for <perforce@freebsd.org>; Wed, 23 Apr 2008 21:35:59 +0000 (UTC)
(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3NLZxJ5064469
for <perforce@freebsd.org>; Wed, 23 Apr 2008 21:36:00 GMT
(envelope-from marius@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3NLZvdx064467
for perforce@freebsd.org; Wed, 23 Apr 2008 21:35:57 GMT
(envelope-from marius@freebsd.org)
Date: Wed, 23 Apr 2008 21:35:57 GMT
Message-Id: <200804232135.m3NLZvdx064467@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marius@freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140473 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2008 21:36:00 -0000
http://perforce.freebsd.org/chv.cgi?CH=140473
Change 140473 by marius@flak on 2008/04/23 21:35:45
IFC @140469 and adjust schizo(4) to MD interrupt changes.
Affected files ...
.. //depot/projects/usiii/amd64/amd64/machdep.c#6 integrate
.. //depot/projects/usiii/amd64/conf/GENERIC#8 integrate
.. //depot/projects/usiii/amd64/include/clock.h#4 integrate
.. //depot/projects/usiii/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/usiii/amd64/isa/clock.c#6 integrate
.. //depot/projects/usiii/amd64/linux32/linux32_dummy.c#3 integrate
.. //depot/projects/usiii/arm/arm/intr.c#3 integrate
.. //depot/projects/usiii/arm/at91/at91.c#3 integrate
.. //depot/projects/usiii/arm/conf/AVILA#7 integrate
.. //depot/projects/usiii/arm/conf/BWCT#4 integrate
.. //depot/projects/usiii/arm/conf/CRB#5 integrate
.. //depot/projects/usiii/arm/conf/EP80219#4 integrate
.. //depot/projects/usiii/arm/conf/HL200#3 integrate
.. //depot/projects/usiii/arm/conf/IQ31244#4 integrate
.. //depot/projects/usiii/arm/conf/KB920X#4 integrate
.. //depot/projects/usiii/arm/conf/SIMICS#4 integrate
.. //depot/projects/usiii/arm/conf/SKYEYE#4 integrate
.. //depot/projects/usiii/arm/include/intr.h#2 integrate
.. //depot/projects/usiii/arm/sa11x0/sa11x0_ost.c#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/acl.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/bitmap.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/callb.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpupart.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/dkio.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/objfs.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq_impl.h#2 integrate
.. //depot/projects/usiii/compat/linux/linux_file.c#5 integrate
.. //depot/projects/usiii/compat/svr4/svr4_misc.c#4 integrate
.. //depot/projects/usiii/conf/NOTES#9 integrate
.. //depot/projects/usiii/conf/files#9 integrate
.. //depot/projects/usiii/conf/files.amd64#6 integrate
.. //depot/projects/usiii/conf/files.i386#6 integrate
.. //depot/projects/usiii/conf/files.pc98#4 integrate
.. //depot/projects/usiii/conf/options#9 integrate
.. //depot/projects/usiii/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/usiii/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/usiii/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/usiii/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/usiii/dev/ata/ata-all.c#4 integrate
.. //depot/projects/usiii/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/usiii/dev/ata/ata-dma.c#5 integrate
.. //depot/projects/usiii/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/usiii/dev/ata/ata-pci.h#6 integrate
.. //depot/projects/usiii/dev/ata/ata-queue.c#3 integrate
.. //depot/projects/usiii/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/usiii/dev/ath/ah_osdep.h#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/amrr/amrr.h#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/onoe/onoe.h#2 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/sample/sample.c#4 integrate
.. //depot/projects/usiii/dev/ath/ath_rate/sample/sample.h#2 integrate
.. //depot/projects/usiii/dev/ath/if_ath.c#6 integrate
.. //depot/projects/usiii/dev/ath/if_ath_pci.c#3 integrate
.. //depot/projects/usiii/dev/ath/if_athioctl.h#2 integrate
.. //depot/projects/usiii/dev/ath/if_athrate.h#2 integrate
.. //depot/projects/usiii/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/usiii/dev/awi/am79c930.c#2 delete
.. //depot/projects/usiii/dev/awi/am79c930reg.h#2 delete
.. //depot/projects/usiii/dev/awi/am79c930var.h#2 delete
.. //depot/projects/usiii/dev/awi/awi.c#3 delete
.. //depot/projects/usiii/dev/awi/awireg.h#2 delete
.. //depot/projects/usiii/dev/awi/awivar.h#2 delete
.. //depot/projects/usiii/dev/awi/if_awi_pccard.c#2 delete
.. //depot/projects/usiii/dev/cxgb/cxgb_l2t.c#4 delete
.. //depot/projects/usiii/dev/cxgb/cxgb_l2t.h#4 delete
.. //depot/projects/usiii/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_offload.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/cxgb_offload.h#5 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#4 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate
.. //depot/projects/usiii/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate
.. //depot/projects/usiii/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/usiii/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/usiii/dev/ipw/if_ipw.c#4 integrate
.. //depot/projects/usiii/dev/ipw/if_ipwvar.h#3 integrate
.. //depot/projects/usiii/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/usiii/dev/iwi/if_iwi.c#4 integrate
.. //depot/projects/usiii/dev/iwi/if_iwivar.h#2 integrate
.. //depot/projects/usiii/dev/k8temp/k8temp.c#2 integrate
.. //depot/projects/usiii/dev/malo/if_malo.c#2 integrate
.. //depot/projects/usiii/dev/malo/if_malo.h#2 integrate
.. //depot/projects/usiii/dev/ral/if_ral_pci.c#2 integrate
.. //depot/projects/usiii/dev/ral/if_ralrate.c#2 delete
.. //depot/projects/usiii/dev/ral/if_ralrate.h#2 delete
.. //depot/projects/usiii/dev/ral/rt2560.c#6 integrate
.. //depot/projects/usiii/dev/ral/rt2560reg.h#3 integrate
.. //depot/projects/usiii/dev/ral/rt2560var.h#3 integrate
.. //depot/projects/usiii/dev/ral/rt2661.c#6 integrate
.. //depot/projects/usiii/dev/ral/rt2661_ucode.h#2 delete
.. //depot/projects/usiii/dev/ral/rt2661var.h#2 integrate
.. //depot/projects/usiii/dev/sound/pci/hda/hdac.c#5 integrate
.. //depot/projects/usiii/dev/usb/if_rum.c#7 integrate
.. //depot/projects/usiii/dev/usb/if_rumvar.h#2 integrate
.. //depot/projects/usiii/dev/usb/if_ural.c#5 integrate
.. //depot/projects/usiii/dev/usb/if_uralvar.h#2 integrate
.. //depot/projects/usiii/dev/usb/if_zyd.c#7 integrate
.. //depot/projects/usiii/dev/usb/if_zydreg.h#3 integrate
.. //depot/projects/usiii/dev/usb/uipaq.c#4 integrate
.. //depot/projects/usiii/dev/usb/usbdevs#8 integrate
.. //depot/projects/usiii/dev/wi/if_wavelan_ieee.h#2 integrate
.. //depot/projects/usiii/dev/wi/if_wi.c#4 integrate
.. //depot/projects/usiii/dev/wi/if_wi_pccard.c#2 integrate
.. //depot/projects/usiii/dev/wi/if_wi_pci.c#2 integrate
.. //depot/projects/usiii/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/usiii/dev/wi/spectrum24t_cf.h#2 delete
.. //depot/projects/usiii/dev/wpi/if_wpi.c#4 integrate
.. //depot/projects/usiii/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/usiii/i386/bios/apm.c#3 integrate
.. //depot/projects/usiii/i386/conf/GENERIC#8 integrate
.. //depot/projects/usiii/i386/conf/PAE#4 integrate
.. //depot/projects/usiii/i386/i386/machdep.c#5 integrate
.. //depot/projects/usiii/i386/include/clock.h#4 integrate
.. //depot/projects/usiii/i386/include/cpufunc.h#2 integrate
.. //depot/projects/usiii/i386/isa/clock.c#5 integrate
.. //depot/projects/usiii/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/usiii/i386/linux/linux_dummy.c#3 integrate
.. //depot/projects/usiii/ia64/conf/DEFAULTS#5 integrate
.. //depot/projects/usiii/ia64/ia64/clock.c#3 integrate
.. //depot/projects/usiii/ia64/ia64/machdep.c#7 integrate
.. //depot/projects/usiii/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/usiii/ia64/ia64/pmap.c#6 integrate
.. //depot/projects/usiii/ia64/include/vmparam.h#4 integrate
.. //depot/projects/usiii/kern/kern_linker.c#5 integrate
.. //depot/projects/usiii/kern/subr_clock.c#3 integrate
.. //depot/projects/usiii/kern/subr_rtc.c#2 integrate
.. //depot/projects/usiii/kern/subr_witness.c#8 integrate
.. //depot/projects/usiii/kern/vfs_mount.c#7 integrate
.. //depot/projects/usiii/mips/conf/ADM5120#2 integrate
.. //depot/projects/usiii/mips/conf/IDT#2 integrate
.. //depot/projects/usiii/mips/conf/MALTA#2 integrate
.. //depot/projects/usiii/mips/conf/QEMU#2 integrate
.. //depot/projects/usiii/mips/conf/SENTRY5#2 integrate
.. //depot/projects/usiii/modules/Makefile#9 integrate
.. //depot/projects/usiii/modules/ath_rate_amrr/Makefile#2 integrate
.. //depot/projects/usiii/modules/ath_rate_onoe/Makefile#2 integrate
.. //depot/projects/usiii/modules/ath_rate_sample/Makefile#2 integrate
.. //depot/projects/usiii/modules/awi/Makefile#2 delete
.. //depot/projects/usiii/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/usiii/modules/cxgb/tom/Makefile#3 integrate
.. //depot/projects/usiii/modules/firmware/Makefile#2 integrate
.. //depot/projects/usiii/modules/malo/Makefile#2 integrate
.. //depot/projects/usiii/modules/ral/Makefile#2 integrate
.. //depot/projects/usiii/modules/ralfw/Makefile#1 branch
.. //depot/projects/usiii/modules/ralfw/Makefile.inc#1 branch
.. //depot/projects/usiii/modules/ralfw/rt2561/Makefile#1 branch
.. //depot/projects/usiii/modules/ralfw/rt2561s/Makefile#1 branch
.. //depot/projects/usiii/modules/ralfw/rt2661/Makefile#1 branch
.. //depot/projects/usiii/modules/wlan/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_acl/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_amrr/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_ccmp/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_rssadapt/Makefile#1 branch
.. //depot/projects/usiii/modules/wlan_scan_ap/Makefile#2 delete
.. //depot/projects/usiii/modules/wlan_scan_sta/Makefile#2 delete
.. //depot/projects/usiii/modules/wlan_tkip/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_wep/Makefile#2 integrate
.. //depot/projects/usiii/modules/wlan_xauth/Makefile#2 integrate
.. //depot/projects/usiii/net/if.c#5 integrate
.. //depot/projects/usiii/net/if_media.h#4 integrate
.. //depot/projects/usiii/net80211/_ieee80211.h#4 integrate
.. //depot/projects/usiii/net80211/ieee80211.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211.h#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_acl.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_adhoc.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_adhoc.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_amrr.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_amrr.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto_ccmp.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto_none.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto_tkip.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_crypto_wep.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_ddb.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_dfs.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_dfs.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_freebsd.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_freebsd.h#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_hostap.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_hostap.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_ht.c#6 integrate
.. //depot/projects/usiii/net80211/ieee80211_ht.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_input.c#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_input.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_ioctl.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_ioctl.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_monitor.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_monitor.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_node.c#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_node.h#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_output.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_phy.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_phy.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_power.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_power.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_proto.c#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_proto.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_regdomain.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_regdomain.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_rssadapt.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_rssadapt.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/usiii/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/usiii/net80211/ieee80211_scan_ap.c#3 delete
.. //depot/projects/usiii/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/usiii/net80211/ieee80211_sta.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_sta.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_var.h#5 integrate
.. //depot/projects/usiii/net80211/ieee80211_wds.c#1 branch
.. //depot/projects/usiii/net80211/ieee80211_wds.h#1 branch
.. //depot/projects/usiii/net80211/ieee80211_xauth.c#2 integrate
.. //depot/projects/usiii/netgraph/ng_base.c#8 integrate
.. //depot/projects/usiii/netinet/in.h#3 integrate
.. //depot/projects/usiii/netinet/in_mcast.c#2 integrate
.. //depot/projects/usiii/netinet/in_pcb.c#6 integrate
.. //depot/projects/usiii/netinet/in_pcb.h#4 integrate
.. //depot/projects/usiii/netinet/ip_divert.c#3 integrate
.. //depot/projects/usiii/netinet/ip_fw2.c#8 integrate
.. //depot/projects/usiii/netinet/ip_icmp.c#3 integrate
.. //depot/projects/usiii/netinet/ip_options.c#4 integrate
.. //depot/projects/usiii/netinet/ip_output.c#5 integrate
.. //depot/projects/usiii/netinet/raw_ip.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_input.c#6 integrate
.. //depot/projects/usiii/netinet/tcp_offload.h#2 integrate
.. //depot/projects/usiii/netinet/tcp_output.c#5 integrate
.. //depot/projects/usiii/netinet/tcp_reass.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_sack.c#2 integrate
.. //depot/projects/usiii/netinet/tcp_subr.c#6 integrate
.. //depot/projects/usiii/netinet/tcp_syncache.c#4 integrate
.. //depot/projects/usiii/netinet/tcp_timer.c#5 integrate
.. //depot/projects/usiii/netinet/tcp_timewait.c#3 integrate
.. //depot/projects/usiii/netinet/tcp_usrreq.c#6 integrate
.. //depot/projects/usiii/netinet/tcp_var.h#7 integrate
.. //depot/projects/usiii/netinet/udp_usrreq.c#4 integrate
.. //depot/projects/usiii/netinet6/icmp6.c#3 integrate
.. //depot/projects/usiii/netinet6/in6_pcb.c#4 integrate
.. //depot/projects/usiii/netinet6/in6_src.c#4 integrate
.. //depot/projects/usiii/netinet6/raw_ip6.c#3 integrate
.. //depot/projects/usiii/netinet6/udp6_usrreq.c#5 integrate
.. //depot/projects/usiii/nfsclient/nfs_vfsops.c#7 integrate
.. //depot/projects/usiii/pc98/cbus/clock.c#3 integrate
.. //depot/projects/usiii/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/usiii/pc98/conf/GENERIC#7 integrate
.. //depot/projects/usiii/pc98/include/clock.h#3 integrate
.. //depot/projects/usiii/pc98/pc98/machdep.c#7 integrate
.. //depot/projects/usiii/powerpc/aim/clock.c#3 integrate
.. //depot/projects/usiii/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/usiii/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/usiii/powerpc/booke/clock.c#3 integrate
.. //depot/projects/usiii/powerpc/conf/DEFAULTS#3 integrate
.. //depot/projects/usiii/powerpc/conf/MPC85XX#3 integrate
.. //depot/projects/usiii/security/audit/audit_arg.c#5 integrate
.. //depot/projects/usiii/security/mac/mac_inet.c#3 integrate
.. //depot/projects/usiii/sparc64/conf/GENERIC#7 integrate
.. //depot/projects/usiii/sparc64/conf/NOTES#2 integrate
.. //depot/projects/usiii/sparc64/fhc/fhc.c#4 integrate
.. //depot/projects/usiii/sparc64/include/bus_common.h#3 integrate
.. //depot/projects/usiii/sparc64/include/intr_machdep.h#5 integrate
.. //depot/projects/usiii/sparc64/pci/psycho.c#8 integrate
.. //depot/projects/usiii/sparc64/pci/schizo.c#5 edit
.. //depot/projects/usiii/sparc64/sbus/sbus.c#4 integrate
.. //depot/projects/usiii/sparc64/sparc64/intr_machdep.c#6 integrate
.. //depot/projects/usiii/sparc64/sparc64/mp_machdep.c#4 integrate
.. //depot/projects/usiii/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/usiii/sparc64/sparc64/upa.c#4 integrate
.. //depot/projects/usiii/sun4v/conf/DEFAULTS#2 integrate
.. //depot/projects/usiii/sun4v/conf/NOTES#2 integrate
.. //depot/projects/usiii/sys/clock.h#2 integrate
.. //depot/projects/usiii/sys/param.h#9 integrate
.. //depot/projects/usiii/sys/termios.h#2 integrate
.. //depot/projects/usiii/sys/time.h#5 integrate
.. //depot/projects/usiii/ufs/ufs/inode.h#3 integrate
.. //depot/projects/usiii/ufs/ufs/ufs_lookup.c#5 integrate
Differences ...
==== //depot/projects/usiii/amd64/amd64/machdep.c#6 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.683 2008/03/16 10:58:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -61,7 +61,6 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
@@ -847,11 +846,23 @@
#if !defined(DEV_ATPIC) && defined(DEV_ISA)
#include <isa/isavar.h>
-u_int
+#include <isa/isareg.h>
+/*
+ * Return a bitmap of the current interrupt requests. This is 8259-specific
+ * and is only suitable for use at probe time.
+ * This is only here to pacify sio. It is NOT FATAL if this doesn't work.
+ * It shouldn't be here. There should probably be an APIC centric
+ * implementation in the apic driver code, if at all.
+ */
+intrmask_t
isa_irq_pending(void)
{
+ u_char irr1;
+ u_char irr2;
- return (0);
+ irr1 = inb(IO_ICU1);
+ irr2 = inb(IO_ICU2);
+ return ((irr2 << 8) | irr1);
}
#endif
==== //depot/projects/usiii/amd64/conf/GENERIC#8 (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.495 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.497 2008/04/20 20:35:34 sam Exp $
cpu HAMMER
ident GENERIC
@@ -239,13 +239,10 @@
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
device an # Aironet 4500/4800 802.11 wireless NICs.
device ath # Atheros pci/cardbus NIC's
device ath_hal # Atheros HAL (Hardware Access Layer)
device ath_rate_sample # SampleRate tx rate control for ath
-device awi # BayStack 660 and others
device ral # Ralink Technology RT2500 wireless NICs.
device wi # WaveLAN/Intersil/Symbol 802.11 wireless NICs.
==== //depot/projects/usiii/amd64/include/clock.h#4 (text+ko) ====
@@ -3,7 +3,7 @@
* Garrett Wollman, September 1994.
* This file is in the public domain.
*
- * $FreeBSD: src/sys/amd64/include/clock.h,v 1.59 2008/04/14 07:59:59 phk Exp $
+ * $FreeBSD: src/sys/amd64/include/clock.h,v 1.60 2008/04/22 19:38:27 phk Exp $
*/
#ifndef _MACHINE_CLOCK_H_
@@ -27,6 +27,7 @@
* Driver to clock driver interface.
*/
+void startrtclock(void);
void init_TSC(void);
void init_TSC_tc(void);
==== //depot/projects/usiii/amd64/include/cpufunc.h#2 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.148 2005/05/13 00:05:55 nectar Exp $
+ * $FreeBSD: src/sys/amd64/include/cpufunc.h,v 1.149 2008/04/18 05:47:56 jeff Exp $
*/
/*
@@ -514,6 +514,19 @@
__asm __volatile("movl %0,%%es" : : "rm" (sel));
}
+static inline void
+cpu_monitor(const void *addr, int extensions, int hints)
+{
+ __asm __volatile("monitor;"
+ : :"a" (addr), "c" (extensions), "d"(hints));
+}
+
+static inline void
+cpu_mwait(int extensions, int hints)
+{
+ __asm __volatile("mwait;" : :"a" (hints), "c" (extensions));
+}
+
#ifdef _KERNEL
/* This is defined in <machine/specialreg.h> but is too painful to get to */
#ifndef MSR_FSBASE
==== //depot/projects/usiii/amd64/isa/clock.c#6 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.242 2008/04/14 07:59:59 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.243 2008/04/22 19:38:27 phk Exp $");
/*
* Routines to handle clock hardware.
@@ -45,7 +45,6 @@
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/lock.h>
#include <sys/kdb.h>
#include <sys/mutex.h>
==== //depot/projects/usiii/amd64/linux32/linux32_dummy.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.11 2008/04/16 19:25:38 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_dummy.c,v 1.12 2008/04/23 15:56:33 rdivacky Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -57,7 +57,6 @@
DUMMY(capget);
DUMMY(capset);
DUMMY(sendfile);
-DUMMY(truncate64);
DUMMY(setfsuid);
DUMMY(setfsgid);
DUMMY(pivot_root);
==== //depot/projects/usiii/arm/arm/intr.c#3 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.21 2008/04/11 03:26:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.22 2008/04/20 23:29:06 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/syslog.h>
@@ -59,6 +59,8 @@
void arm_handler_execute(struct trapframe *, int);
+void (*arm_post_filter)(void *) = NULL;
+
void
arm_setup_irqhandler(const char *name, driver_filter_t *filt,
void (*hand)(void*), void *arg, int irq, int flags, void **cookiep)
@@ -72,7 +74,7 @@
if (event == NULL) {
error = intr_event_create(&event, (void *)irq, 0, irq,
(mask_fn)arm_mask_irq, (mask_fn)arm_unmask_irq,
- NULL, NULL, "intr%d:", irq);
+ arm_post_filter, NULL, "intr%d:", irq);
if (error)
return;
intr_events[irq] = event;
==== //depot/projects/usiii/arm/at91/at91.c#3 (text) ====
@@ -23,7 +23,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.15 2007/12/19 17:34:17 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.16 2008/04/20 23:29:06 cognet Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -47,6 +47,8 @@
static struct at91_softc *at91_softc;
+static void at91_eoi(void *);
+
static int
at91_bs_map(void *t, bus_addr_t bpa, bus_size_t size, int flags,
bus_space_handle_t *bshp)
@@ -172,6 +174,7 @@
at91_probe(device_t dev)
{
device_set_desc(dev, "AT91 device bus");
+ arm_post_filter = at91_eoi;
return (0);
}
@@ -689,6 +692,13 @@
}
+static void
+at91_eoi(void *unused)
+{
+ bus_space_write_4(at91_softc->sc_st, at91_softc->sc_sys_sh,
+ IC_EOICR, 0);
+}
+
static device_method_t at91_methods[] = {
DEVMETHOD(device_probe, at91_probe),
DEVMETHOD(device_attach, at91_attach),
==== //depot/projects/usiii/arm/conf/AVILA#7 (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/arm/conf/AVILA,v 1.11 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.13 2008/04/21 10:09:54 phk Exp $
machine arm
ident AVILA
@@ -80,7 +80,6 @@
#options PREEMPTION
#options VERBOSE_SYSINIT
-device genclock
device mem # Memory and kernel memory devices
#device saarm
@@ -130,8 +129,6 @@
device wlan_wep # 802.11 WEP support
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
-device wlan_scan_sta
-device wlan_scan_ap
device wlan_xauth
device ath # Atheros pci/cardbus NIC's
device ath_hal # Atheros HAL (Hardware Access Layer)
==== //depot/projects/usiii/arm/conf/BWCT#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/BWCT,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/BWCT,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident BWCT
@@ -68,7 +68,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device loop
device random
device ether
==== //depot/projects/usiii/arm/conf/CRB#5 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/CRB,v 1.4 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/CRB,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident CRB
@@ -65,7 +65,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/usiii/arm/conf/EP80219#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/EP80219,v 1.7 2008/03/27 11:54:17 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/EP80219,v 1.8 2008/04/21 10:09:54 phk Exp $
machine arm
ident EP80219
@@ -67,7 +67,6 @@
options BOOTP_WIRED_TO=fxp0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/usiii/arm/conf/HL200#3 (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/arm/conf/HL200,v 1.3 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.5 2008/04/21 10:09:54 phk Exp $
machine arm
ident HL200
@@ -74,7 +74,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
@@ -147,5 +146,3 @@
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
==== //depot/projects/usiii/arm/conf/IQ31244#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.21 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.22 2008/04/21 10:09:54 phk Exp $
machine arm
ident IQ31244
@@ -64,7 +64,6 @@
options BOOTP_WIRED_TO=em0
options BOOTP_COMPAT
#options PREEMPTION
-device genclock
device loop
device ether
device mem # Memory and kernel memory devices
==== //depot/projects/usiii/arm/conf/KB920X#4 (text) ====
@@ -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/arm/conf/KB920X,v 1.15 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/KB920X,v 1.17 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -62,7 +62,6 @@
options RWLOCK_NOINLINE
options NO_FFS_SNAPSHOT
options NO_SWAPPING
-device genclock
device random
device pty
device loop
@@ -135,5 +134,3 @@
device wlan_ccmp # 802.11 CCMP support
device wlan_tkip # 802.11 TKIP support
device wlan_amrr # AMRR transmit rate control algorithm
-device wlan_scan_ap # 802.11 AP mode scanning
-device wlan_scan_sta # 802.11 STA mode scanning
==== //depot/projects/usiii/arm/conf/SIMICS#4 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.15 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.16 2008/04/21 10:09:54 phk Exp $
machine arm
ident SIMICS
@@ -54,7 +54,6 @@
options SYSVMSG #SYSV-style message queues
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
-device genclock
device loop
device ether
device saip
==== //depot/projects/usiii/arm/conf/SKYEYE#4 (text) ====
@@ -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/arm/conf/SKYEYE,v 1.9 2008/03/27 11:54:18 dfr Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.10 2008/04/21 10:09:54 phk Exp $
machine arm
ident KB920X
@@ -59,7 +59,6 @@
options SYSVSEM #SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING #Posix P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-device genclock
device loop
device ether
#device saarm
==== //depot/projects/usiii/arm/include/intr.h#2 (text+ko) ====
@@ -32,7 +32,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/arm/include/intr.h,v 1.7 2007/06/16 15:03:33 cognet Exp $
+ * $FreeBSD: src/sys/arm/include/intr.h,v 1.8 2008/04/20 23:29:06 cognet Exp $
*
*/
@@ -55,4 +55,5 @@
void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*),
void *, int, int, void **);
int arm_remove_irqhandler(void *);
+extern void (*arm_post_filter)(void *);
#endif /* _MACHINE_INTR_H */
==== //depot/projects/usiii/arm/sa11x0/sa11x0_ost.c#2 (text+ko) ====
@@ -38,14 +38,13 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.7 2007/02/26 05:17:47 kevlo Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.8 2008/04/22 19:38:27 phk Exp $");
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/kernel.h>
#include <sys/time.h>
#include <sys/bus.h>
-#include <sys/clock.h>
#include <sys/module.h>
#include <machine/bus.h>
==== //depot/projects/usiii/cddl/compat/opensolaris/kern/opensolaris_string.c#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c,v 1.4 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2007 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/rpc/xdr.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/rpc/xdr.h,v 1.4 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/acl.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/acl.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/bitmap.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/bitmap.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/byteorder.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/byteorder.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/callb.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/callb.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/cpupart.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpupart.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/cpuvar.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/cpuvar.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/dkio.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/dkio.h,v 1.3 2008/04/22 07:42:59 jb Exp $
*/
/*
* Copyright 2006 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/mntent.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/mntent.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2005 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/objfs.h#2 (text+ko) ====
@@ -17,6 +17,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/objfs.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
#ifndef _COMPAT_OPENSOLARIS_SYS_OBJFS_H
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/sysmacros.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/sysmacros.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/* Copyright (c) 1984, 1986, 1987, 1988, 1989 AT&T */
/* All Rights Reserved */
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/cddl/compat/opensolaris/sys/taskq_impl.h#2 (text+ko) ====
@@ -18,6 +18,8 @@
* information: Portions Copyright [yyyy] [name of copyright owner]
*
* CDDL HEADER END
+ *
+ * $FreeBSD: src/sys/cddl/compat/opensolaris/sys/taskq_impl.h,v 1.3 2008/04/22 07:43:00 jb Exp $
*/
/*
* Copyright 2004 Sun Microsystems, Inc. All rights reserved.
==== //depot/projects/usiii/compat/linux/linux_file.c#5 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.112 2008/04/09 16:42:50 rdivacky Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.113 2008/04/23 15:56:33 rdivacky Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -886,6 +886,7 @@
LFREEPATH(name);
return (error);
}
+
int
linux_truncate(struct thread *td, struct linux_truncate_args *args)
{
@@ -905,6 +906,23 @@
}
int
+linux_truncate64(struct thread *td, struct linux_truncate64_args *args)
+{
+ char *path;
+ int error;
+
+ LCONVPATHEXIST(td, args->path, &path);
+
+#ifdef DEBUG
+ if (ldebug(truncate64))
+ printf(ARGS(truncate64, "%s, %jd"), path, args->length);
+#endif
+
+ error = kern_truncate(td, path, UIO_SYSSPACE, args->length);
+ LFREEPATH(path);
+ return (error);
+}
+int
linux_ftruncate(struct thread *td, struct linux_ftruncate_args *args)
{
struct ftruncate_args /* {
==== //depot/projects/usiii/compat/svr4/svr4_misc.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.100 2008/01/13 14:44:01 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_misc.c,v 1.101 2008/04/21 21:24:08 rdivacky Exp $");
#include "opt_mac.h"
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Wed Apr 23 22:40:34 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 8C5AB1065672; Wed, 23 Apr 2008 22:40:34 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 47B7D1065682
for <perforce@FreeBSD.org>; Wed, 23 Apr 2008 22:40:34 +0000 (UTC)
(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 331538FC1F
for <perforce@FreeBSD.org>; Wed, 23 Apr 2008 22:40:34 +0000 (UTC)
(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3NMeYuc070572
for <perforce@FreeBSD.org>; Wed, 23 Apr 2008 22:40:34 GMT
(envelope-from snagg@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3NMeYVK070570
for perforce@freebsd.org; Wed, 23 Apr 2008 22:40:34 GMT
(envelope-from snagg@FreeBSD.org)
Date: Wed, 23 Apr 2008 22:40:34 GMT
Message-Id: <200804232240.m3NMeYVK070570@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
snagg@FreeBSD.org using -f
From: Vincenzo Iozzo <snagg@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140480 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 23 Apr 2008 22:40:34 -0000
http://perforce.freebsd.org/chv.cgi?CH=140480
Change 140480 by snagg@snagg_macosx on 2008/04/23 22:40:28
This branch will collect my work releated to auditpipe and a framework for testing audit system. This project is maintained by Vincenzo Iozzo.
Affected files ...
.. //depot/projects/soc2008/snagg-audit/sys/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/acpica/OsdEnvironment.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/acpica/acpi_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/acpica/acpi_wakeup.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/acpica/madt.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/amd64_mem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/apic_vector.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/atomic.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/autoconf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/bios.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/bpf_jit_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/bpf_jit_machdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/busdma_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/cpu_switch.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/db_disasm.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/db_interface.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/db_trace.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/dump_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/elf_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/exception.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/fpu.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/gdb_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/genassym.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/identcpu.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/in_cksum.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/initcpu.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/intr_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/io.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/io_apic.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/legacy.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/local_apic.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/locore.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/mem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/minidump_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/mp_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/mp_watchdog.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/mpboot.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/mptable.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/mptable_pci.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/msi.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/nexus.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/pmap.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/prof_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/sigtramp.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/stack_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/support.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/sys_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/trap.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/tsc.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/uio_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/uma_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/vm_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/compile/.cvsignore#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/.cvsignore#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/DEFAULTS#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/GENERIC#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/GENERIC.hints#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/MAC#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/conf/NOTES#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/ia32/ia32_exception.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/ia32/ia32_reg.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/ia32/ia32_signal.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/ia32/ia32_sigtramp.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/ia32/ia32_syscall.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/_bus.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/_inttypes.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/_limits.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/_stdint.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/_types.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/acpica_machdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/apicreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/apicvar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/asm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/asmacros.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/atomic.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/bus.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/bus_dma.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/clock.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/cpu.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/cpufunc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/cputypes.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/db_machdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/elf.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/endian.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/exec.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/float.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/floatingpoint.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/fpu.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/frame.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/gdb_machdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/ieeefp.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/in_cksum.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/intr_machdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/iodev.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/kdb.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/legacyvar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/limits.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/md_var.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/memdev.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/metadata.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/minidump.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/mp_watchdog.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/mptable.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/mutex.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/nexusvar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/param.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pc/bios.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pc/display.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pcb.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pci_cfgreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pcpu.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pmap.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pmc_mdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/ppireg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/proc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/profile.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/psl.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/ptrace.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/reloc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/resource.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/runq.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/segments.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/setjmp.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/sf_buf.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/sigframe.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/signal.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/smp.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/specialreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/stack.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/stdarg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/sysarch.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/timerreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/trap.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/tss.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/ucontext.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/varargs.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/vmparam.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/isa/atpic.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/isa/atpic_vector.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/isa/clock.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/isa/elcr.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/isa/icu.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/isa/isa.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/isa/isa.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/isa/isa_dma.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/isa/nmi.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_dummy.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_genassym.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_ipc64.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_locore.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_proto.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_support.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_syscall.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_sysent.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/linux32_sysvec.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/syscalls.conf#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/linux32/syscalls.master#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/pci/pci_bus.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/amd64/pci/pci_cfgreg.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/autoconf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/bcopy_page.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/bcopyinout.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/bcopyinout_xscale.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/blockio.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/bootconfig.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/bus_space_asm_generic.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/bus_space_generic.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/busdma_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/copystr.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_arm10.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_arm11.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_arm7tdmi.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_arm8.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_arm9.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_armv4.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_armv5.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_armv5_ec.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_ixp12x0.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_sa1.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_sa11x0.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_xscale.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/cpufunc_asm_xscale_c3.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/db_disasm.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/db_interface.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/db_trace.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/disassem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/dump_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/elf_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/elf_trampoline.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/exception.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/fiq.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/fiq_subr.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/fusu.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/gdb_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/genassym.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/identcpu.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/in_cksum.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/in_cksum_arm.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/inckern.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/intr.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/irq_dispatch.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/locore.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/mem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/nexus.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/pmap.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/setcpsr.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/setstack.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/stack_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/support.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/swtch.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/sys_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/trap.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/uio_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/undefined.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/vectors.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/vm_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_mci.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_mcireg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_pdcreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_pio.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_pio_rm9200.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_pioreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_piovar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_pmc.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_pmcreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_pmcvar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_rtc.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_rtcreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_spi.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_spireg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_ssc.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_sscreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_st.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_streg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_twi.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_twiio.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_twireg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91_usartreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91rm92reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/at91var.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/files.at91#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/files.kb920x#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/hints.at91rm9200#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/hints.at91sam9261#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/if_ate.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/if_atereg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/kb920x_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/ohci_atmelarm.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/std.at91#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/std.kb920x#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/uart_bus_at91usart.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/uart_cpu_at91rm9200usart.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/at91/uart_dev_at91usart.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/compile/.cvsignore#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/.cvsignore#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/AVILA#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/AVILA.hints#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/BWCT#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/BWCT.hints#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/CRB#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/EP80219#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/HL200#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/IQ31244#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/KB920X#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/KB920X.hints#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/SIMICS#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/conf/SKYEYE#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/_bus.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/_inttypes.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/_limits.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/_stdint.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/_types.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/armreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/asm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/asmacros.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/atomic.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/blockio.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/bootconfig.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/bus.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/bus_dma.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/clock.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/cpu.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/cpuconf.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/cpufunc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/db_machdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/disassem.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/elf.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/endian.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/exec.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/fiq.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/float.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/floatingpoint.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/fp.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/frame.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/gdb_machdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/ieee.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/ieeefp.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/in_cksum.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/intr.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/katelib.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/kdb.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/limits.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/machdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/md_var.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/memdev.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/metadata.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/mutex.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/param.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/pcb.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/pcpu.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/pmap.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/pmc_mdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/proc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/profile.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/psl.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/pte.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/ptrace.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/reloc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/resource.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/runq.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/setjmp.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/sf_buf.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/sigframe.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/signal.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/smp.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/stack.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/stdarg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/swi.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/sysarch.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/trap.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/ucontext.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/undefined.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/utrap.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/include/vmparam.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/assabet_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/files.sa11x0#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_dmacreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_gpioreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_io.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_io_asm.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_irq.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_irqhandler.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_ost.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_ostreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_ppcreg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/sa11x0_var.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/std.sa11x0#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/uart_bus_sa1110.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/uart_cpu_sa1110.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/uart_dev_sa1110.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/sa11x0/uart_dev_sa1110.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/ep80219_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/files.ep80219#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/files.i80219#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/files.i80321#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/files.iq31244#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321_aau.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321_dma.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321_intr.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321_mcu.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321_pci.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321_space.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321_timer.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321_wdog.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/i80321var.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/iq31244_7seg.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/iq31244_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/iq80321.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/iq80321reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/iq80321var.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/obio.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/obio_space.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/obiovar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/std.ep80219#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/std.i80219#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/std.i80321#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/std.iq31244#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/uart_bus_i80321.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i80321/uart_cpu_i80321.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/crb_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/files.crb#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/files.i81342#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/i81342.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/i81342_mcu.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/i81342_pci.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/i81342_space.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/i81342reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/i81342var.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/iq81342_7seg.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/iq81342reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/iq81342var.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/obio.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/obio_space.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/obiovar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/std.crb#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/std.i81342#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/uart_bus_i81342.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/i8134x/uart_cpu_i81342.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/avila_ata.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/avila_led.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/avila_machdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/files.avila#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/files.ixp425#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/if_npe.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/if_npereg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixdp425_pci.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixdp425reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_a4x_io.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_a4x_space.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_iic.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_intr.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_mem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_npe.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_npereg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_npevar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_pci.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_pci_asm.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_pci_space.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_qmgr.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_qmgr.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_space.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_timer.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425_wdog.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425reg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/ixp425var.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/std.avila#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/std.ixp425#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/uart_bus_ixp425.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/ixp425/uart_cpu_ixp425.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/std.xscale#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/xscalereg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/arm/xscale/xscalevar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/README#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot0/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot0/README#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot0/linker.cfg#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot0/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot0iic/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot0iic/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot0spi/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot0spi/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot2/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot2/board.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot2/boot2.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot2/bwct_board.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot2/centipad_board.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/boot2/kb920x_board.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootiic/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootiic/README#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootiic/env_vars.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootiic/env_vars.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootiic/loader_prompt.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootiic/loader_prompt.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootiic/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootspi/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootspi/README#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootspi/ee.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootspi/ee.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootspi/env_vars.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootspi/env_vars.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootspi/loader_prompt.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootspi/loader_prompt.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/bootspi/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/arm_init.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/at91rm9200.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/at91rm9200_lowlevel.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/delay.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/eeprom.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/emac.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/emac.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/emac_init.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/getc.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/lib.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/lib_AT91RM9200.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/mci_device.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/memcmp.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/memcpy.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/memset.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/p_string.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/printf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/putchar.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/reset.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/sd-card.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/sd-card.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/spi_flash.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/spi_flash.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/strcmp.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/strcpy.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/strcvt.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/strlen.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/tag_list.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/tag_list.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/libat91/xmodem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/arm/at91/linker.cfg#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/bcache.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/boot.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/bootstrap.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/commands.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/console.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/dev_net.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/dev_net.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/devopen.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/help.common#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/interp.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/interp_backslash.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/interp_forth.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/interp_parse.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/isapnp.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/isapnp.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/load.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/load_elf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/load_elf32.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/load_elf32_obj.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/load_elf64.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/load_elf64_obj.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/load_elf_obj.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/loader.8#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/ls.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/merge_help.awk#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/misc.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/module.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/newvers.sh#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/panic.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/pnp.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/reloc_elf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/reloc_elf32.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/reloc_elf64.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/common/ufsread.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/README#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efi.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efi_nii.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efiapi.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/eficon.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efidebug.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efidef.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efidevp.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efierr.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efifpswa.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efifs.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efilib.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efinet.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efipart.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efiprot.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efipxebc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efiser.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/efistdarg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/i386/efibind.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/i386/pe.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/ia64/efibind.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/include/ia64/pe.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/libefi/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/libefi/delay.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/libefi/efi_console.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/libefi/efifs.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/libefi/efinet.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/libefi/errno.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/libefi/handles.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/libefi/libefi.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/efi/libefi/time.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/arm/sysdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/arm/sysdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/dict.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/ficl.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/ficl.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/fileaccess.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/float.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/i386/sysdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/i386/sysdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/ia64/sysdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/ia64/sysdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/loader.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/math64.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/math64.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/powerpc/sysdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/powerpc/sysdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/prefix.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/search.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/classes.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/ficlclass.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/ficllocal.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/fileaccess.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/forml.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/freebsd.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/ifbrack.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/jhlocal.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/marker.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/oo.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/prefix.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/softcore.awk#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/softcore.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/softwords/string.fr#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/sparc64/sysdep.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/sparc64/sysdep.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/stack.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/testmain.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/tools.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/unix.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/vm.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ficl/words.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/beastie.4th#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/frames.4th#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/loader.4th#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/loader.4th.8#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/loader.conf#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/loader.conf.5#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/loader.rc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/pnp.4th#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/screen.4th#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/forth/support.4th#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot0/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot0/boot0.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot0/boot0ext.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot0ext/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot0sio/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot2/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot2/boot1.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot2/boot2.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot2/lib.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/boot2/sio.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/btx/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/btx/btx.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/btxldr/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/btxldr/btxldr.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/lib/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/lib/btxcsu.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/lib/btxsys.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/lib/btxv86.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/btx/lib/btxv86.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/cdboot/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/cdboot/cdboot.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/kgzldr/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/kgzldr/boot.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/kgzldr/crt.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/kgzldr/kgzldr.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/kgzldr/lib.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/kgzldr/sio.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/kgzldr/start.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libfirewire/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libfirewire/dconsole.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libfirewire/firewire.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libfirewire/fwohci.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libfirewire/fwohci.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libfirewire/fwohcireg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/amd64_tramp.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/biosacpi.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/bioscd.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/biosdisk.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/biosmem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/biospci.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/biospnp.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/biossmap.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/bootinfo.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/bootinfo32.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/bootinfo64.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/comconsole.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/devicename.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/elf32_freebsd.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/elf64_freebsd.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/i386_copy.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/i386_module.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/libi386.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/nullconsole.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/pread.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/pxe.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/pxe.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/pxetramp.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/smbios.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/time.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/libi386/vidconsole.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/loader/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/loader/conf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/loader/help.i386#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/loader/loader.rc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/loader/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/loader/version#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/mbr/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/mbr/mbr.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/pxeldr/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/pxeldr/pxeboot.8#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/i386/pxeldr/pxeldr.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/common/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/common/autoload.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/common/bootinfo.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/common/copy.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/common/devicename.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/common/exec.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/common/libia64.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/efi/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/efi/conf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/efi/efimd.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/efi/ldscript.ia64#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/efi/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/efi/start.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/efi/version#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/acpi_stub.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/conf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/delay.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/efi_stub.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/exit.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/ldscript.ia64#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/libski.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/pal_stub.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/sal_stub.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/skiconsole.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/skifs.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/skiload.cmd#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/skimd.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/ssc.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/start.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/time.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ia64/ski/version#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/common/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/common/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/devicename.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/elf_freebsd.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/libofw.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/ofw_console.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/ofw_copy.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/ofw_disk.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/ofw_memory.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/ofw_module.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/ofw_net.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/ofw_reboot.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/ofw_time.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/openfirm.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/ofw/libofw/openfirm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/boot.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/boot0.5.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/disk.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/ldscript#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/putssjis.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/selector.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/start.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/support.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0.5/syscons.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot0/boot0.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/README.serial.98#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/asm.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/asm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/bios.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/boot.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/boot.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/boot2.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/dinode.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/disk.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/fs.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/inode.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/io.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/probe_keyboard.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/quota.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/serial.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/serial_16550.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/serial_8251.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/start.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/sys.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/boot2/table.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/btx/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/btx/btx.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/btxldr/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/btxldr/btxldr.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/lib/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/lib/btxcsu.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/lib/btxsys.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/lib/btxv86.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/btx/lib/btxv86.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/cdboot/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/cdboot/cdboot.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/kgzldr/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/kgzldr/crt.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/libpc98/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/libpc98/bioscd.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/libpc98/biosdisk.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/libpc98/biosmem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/libpc98/biossmap.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/libpc98/comconsole.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/libpc98/i386_module.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/libpc98/time.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/libpc98/vidconsole.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/loader/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/loader/conf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/loader/help.pc98#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/pc98/loader/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/ofw/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/ofw/conf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/ofw/help.ofw#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/ofw/metadata.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/ofw/start.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/ofw/version#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/uboot/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/uboot/conf.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/uboot/help.uboot#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/uboot/ldscript.powerpc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/uboot/metadata.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/uboot/start.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/powerpc/uboot/version#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/boot1/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/boot1/_start.s#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/boot1/boot1.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/loader/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/loader/help.sparc64#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/loader/locore.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/loader/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/loader/metadata.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/sparc64/loader/version#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/common/Makefile.inc#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/common/main.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/Makefile#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/api_public.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/console.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/copy.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/devicename.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/disk.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/elf_freebsd.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/glue.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/glue.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/libuboot.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/module.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/net.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/reboot.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/boot/uboot/lib/time.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/bsm/audit.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/bsm/audit_internal.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/bsm/audit_kevents.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/bsm/audit_record.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/README.quirks#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_ccb.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_debug.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_periph.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_periph.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_queue.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_queue.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_sim.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_sim.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_xpt.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_xpt.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_xpt_periph.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/cam_xpt_sim.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_all.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_all.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_cd.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_cd.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_ch.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_ch.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_da.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_da.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_dvcfg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_iu.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_low.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_low.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_low_pisa.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_low_pisa.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_message.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_pass.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_pass.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_pt.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_pt.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_sa.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_sa.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_ses.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_ses.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_sg.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_sg.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_targ_bh.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_target.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cam/scsi/scsi_targetio.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_kobj.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_kstat.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_misc.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_policy.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/kern/opensolaris_zone.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/machine/endian.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/rpc/xdr.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/acl.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/atomic.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/byteorder.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/callb.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/cmn_err.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/cred.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/debug.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/dirent.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/dkio.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/dnlc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/kcondvar.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/kmem.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/kobj.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/kstat.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/lock.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/misc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/mntent.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/mnttab.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/mount.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/mutex.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/policy.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/proc.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/random.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/rwlock.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/sdt.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/string.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/sunddi.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/sysmacros.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/systm.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/taskq.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/taskq_impl.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/time.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/types.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/uio.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/varargs.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/vfs.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/vnode.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/compat/opensolaris/sys/zone.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/acl/acl_common.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/acl/acl_common.h#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/atomic/amd64/atomic.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/atomic/i386/atomic.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/atomic/ia64/atomic.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/avl/avl.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/nvpair/nvpair_alloc_fixed.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.c#1 branch
.. //depot/projects/soc2008/snagg-audit/sys/cddl/contrib/opensolaris/common/zfs/zfs_namecheck.h#1 branch
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 00:24:27 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id A83BE1065673; Thu, 24 Apr 2008 00:24:27 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 6A0BB106566B
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 00:24:27 +0000 (UTC)
(envelope-from snb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 491558FC1A
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 00:24:27 +0000 (UTC)
(envelope-from snb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3O0OReL077284
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 00:24:27 GMT
(envelope-from snb@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3O0OQKE077274
for perforce@freebsd.org; Thu, 24 Apr 2008 00:24:26 GMT
(envelope-from snb@FreeBSD.org)
Date: Thu, 24 Apr 2008 00:24:26 GMT
Message-Id: <200804240024.m3O0OQKE077274@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
snb@FreeBSD.org using -f
From: Nick Barkas <snb@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140484 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 00:24:27 -0000
http://perforce.freebsd.org/chv.cgi?CH=140484
Change 140484 by snb@snb_unagi on 2008/04/24 00:23:34
Initial project description
Affected files ...
.. //depot/projects/soc2008/snb-dirhash/README#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 01:00:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B79B61065675; Thu, 24 Apr 2008 01:00:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 79CE9106566B
for <perforce@freebsd.org>; Thu, 24 Apr 2008 01:00:13 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 741158FC15
for <perforce@freebsd.org>; Thu, 24 Apr 2008 01:00:13 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3O10D1F087923
for <perforce@freebsd.org>; Thu, 24 Apr 2008 01:00:13 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3O10AHH087912
for perforce@freebsd.org; Thu, 24 Apr 2008 01:00:10 GMT
(envelope-from sam@freebsd.org)
Date: Thu, 24 Apr 2008 01:00:10 GMT
Message-Id: <200804240100.m3O10AHH087912@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140487 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 01:00:14 -0000
http://perforce.freebsd.org/chv.cgi?CH=140487
Change 140487 by sam@sam_ebb on 2008/04/24 01:00:04
add rules to embed firmware images in a kernel
Affected files ...
.. //depot/projects/vap/sys/conf/files#34 edit
Differences ...
==== //depot/projects/vap/sys/conf/files#34 (text+ko) ====
@@ -752,7 +752,63 @@
dev/isp/isp_target.c optional isp
dev/ispfw/ispfw.c optional ispfw
dev/iwi/if_iwi.c optional iwi
+iwibssfw.c optional iwibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwibssfw.c"
+iwi_bss.fwo optional iwibssfw | iwifw \
+ dependency "iwi_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \
+ no-implicit-rule \
+ clean "iwi_bss.fwo"
+iwi_bss.fw optional iwibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode < $S/contrib/dev/iwi/ipw2200-bss.fw.uu > ${.TARGET}"\
+ no-obj no-implicit-rule \
+ clean "iwi_bss.fw"
+iwiibssfw.c optional iwiibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwiibssfw.c"
+iwi_ibss.fwo optional iwiibssfw | iwifw \
+ dependency "iwi_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \
+ no-implicit-rule \
+ clean "iwi_ibss.fwo"
+iwi_ibss.fw optional iwiibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode < $S/contrib/dev/iwi/ipw2200-ibss.fw.uu > ${.TARGET}"\
+ no-obj no-implicit-rule \
+ clean "iwi_ibss.fw"
+iwimonitorfw.c optional iwimonitorfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwimonitorfw.c"
+iwi_monitor.fwo optional iwimonitorfw | iwifw \
+ dependency "iwi_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \
+ no-implicit-rule \
+ clean "iwi_monitor.fwo"
+iwi_monitor.fw optional iwimonitorfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode < $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu > ${.TARGET}"\
+ no-obj no-implicit-rule \
+ clean "iwi_monitor.fw"
dev/iwn/if_iwn.c optional iwn
+iwnfw.c optional iwnfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwn.fw:iwnfw:44417 -lintel_iwn -miwn -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwnfw.c"
+iwnfw.fwo optional iwnfw \
+ dependency "iwn.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwn.fw" \
+ no-implicit-rule \
+ clean "iwn.fwo"
+iwn.fw optional iwnfw \
+ dependency ".PHONY" \
+ compile-with "uudecode < $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu > ${.TARGET}" \
+ no-obj no-implicit-rule \
+ clean "iwn.fw"
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
@@ -931,7 +987,64 @@
dev/quicc/quicc_core.c optional quicc
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
+dev/ral/rt2860.c optional ral
dev/ral/if_ral_pci.c optional ral pci
+rt2561fw.c optional rt2561fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561fw.c"
+rt2561fw.fwo optional rt2561fw | ralfw \
+ dependency "rt2561.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
+ no-implicit-rule \
+ clean "rt2561.fwo"
+rt2561.fw optional rt2561fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode < $S/contrib/dev/ral/rt2561.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561.fw"
+rt2561sfw.c optional rt2561sfw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561sfw.c"
+rt2561sfw.fwo optional rt2561sfw | ralfw \
+ dependency "rt2561s.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
+ no-implicit-rule \
+ clean "rt2561s.fwo"
+rt2561s.fw optional rt2561sfw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode < $S/contrib/dev/ral/rt2561s.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561s.fw"
+rt2661fw.c optional rt2661fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2661fw.c"
+rt2661fw.fwo optional rt2661fw | ralfw \
+ dependency "rt2661.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
+ no-implicit-rule \
+ clean "rt2661.fwo"
+rt2661.fw optional rt2661fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode < $S/contrib/dev/ral/rt2661.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2661.fw"
+rt2860fw.c optional rt2860fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2860fw.c"
+rt2860fw.fwo optional rt2860fw | ralfw \
+ dependency "rt2860.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
+ no-implicit-rule \
+ clean "rt2860.fwo"
+rt2860.fw optional rt2860fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode < $S/contrib/dev/ral/rt2860.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2860.fw"
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
@@ -1194,6 +1307,20 @@
dev/wi/if_wi_pccard.c optional wi pccard
dev/wi/if_wi_pci.c optional wi pci
dev/wl/if_wl.c optional wl isa
+wpifw.c optional wpifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -lintel_wpi -mwpi -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "wpifw.c"
+wpifw.fwo optional wpifw \
+ dependency "wpi.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} wpi.fw" \
+ no-implicit-rule \
+ clean "wpi.fwo"
+wpi.fw optional wpifw \
+ dependency ".PHONY" \
+ compile-with "uudecode < $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu > ${.TARGET}" \
+ no-obj no-implicit-rule \
+ clean "wpi.fw"
dev/xe/if_xe.c optional xe
dev/xe/if_xe_pccard.c optional xe pccard
fs/coda/coda_fbsd.c optional vcoda
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 04:35:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6B7911065673; Thu, 24 Apr 2008 04:35:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2DF6F1065670
for <perforce@freebsd.org>; Thu, 24 Apr 2008 04:35:58 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 353AD8FC1E
for <perforce@freebsd.org>; Thu, 24 Apr 2008 04:35:58 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3O4ZwqA099954
for <perforce@freebsd.org>; Thu, 24 Apr 2008 04:35:58 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3O4ZvIW099952
for perforce@freebsd.org; Thu, 24 Apr 2008 04:35:57 GMT
(envelope-from sam@freebsd.org)
Date: Thu, 24 Apr 2008 04:35:57 GMT
Message-Id: <200804240435.m3O4ZvIW099952@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140496 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 04:35:58 -0000
http://perforce.freebsd.org/chv.cgi?CH=140496
Change 140496 by sam@sam_ebb on 2008/04/24 04:35:25
o add ipw firmware rules
o fix uudecode usage for builtin firmware; need to use -o to
force output to a specific file
Affected files ...
.. //depot/projects/vap/sys/conf/files#35 edit
Differences ...
==== //depot/projects/vap/sys/conf/files#35 (text+ko) ====
@@ -738,6 +738,48 @@
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
+ipwbssfw.c optional ipwbssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwbssfw.c"
+ipw_bss.fwo optional ipwbssfw | ipwfw \
+ dependency "ipw_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \
+ no-implicit-rule \
+ clean "ipw_bss.fwo"
+ipw_bss.fw optional ipwbssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_bss.fw"
+ipwibssfw.c optional ipwibssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwibssfw.c"
+ipw_ibss.fwo optional ipwibssfw | ipwfw \
+ dependency "ipw_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \
+ no-implicit-rule \
+ clean "ipw_ibss.fwo"
+ipw_ibss.fw optional ipwibssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_ibss.fw"
+ipwmonitorfw.c optional ipwmonitorfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwmonitorfw.c"
+ipw_monitor.fwo optional ipwmonitorfw | ipwfw \
+ dependency "ipw_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \
+ no-implicit-rule \
+ clean "ipw_monitor.fwo"
+ipw_monitor.fw optional ipwmonitorfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_monitor.fw"
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
@@ -763,7 +805,7 @@
clean "iwi_bss.fwo"
iwi_bss.fw optional iwibssfw | iwifw \
dependency ".PHONY" \
- compile-with "uudecode < $S/contrib/dev/iwi/ipw2200-bss.fw.uu > ${.TARGET}"\
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
no-obj no-implicit-rule \
clean "iwi_bss.fw"
iwiibssfw.c optional iwiibssfw | iwifw \
@@ -777,7 +819,7 @@
clean "iwi_ibss.fwo"
iwi_ibss.fw optional iwiibssfw | iwifw \
dependency ".PHONY" \
- compile-with "uudecode < $S/contrib/dev/iwi/ipw2200-ibss.fw.uu > ${.TARGET}"\
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
no-obj no-implicit-rule \
clean "iwi_ibss.fw"
iwimonitorfw.c optional iwimonitorfw | iwifw \
@@ -791,7 +833,7 @@
clean "iwi_monitor.fwo"
iwi_monitor.fw optional iwimonitorfw | iwifw \
dependency ".PHONY" \
- compile-with "uudecode < $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu > ${.TARGET}"\
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
no-obj no-implicit-rule \
clean "iwi_monitor.fw"
dev/iwn/if_iwn.c optional iwn
@@ -806,7 +848,7 @@
clean "iwn.fwo"
iwn.fw optional iwnfw \
dependency ".PHONY" \
- compile-with "uudecode < $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu > ${.TARGET}" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwn/iwlwifi-4965-4.44.17.fw.uu" \
no-obj no-implicit-rule \
clean "iwn.fw"
dev/ixgb/if_ixgb.c optional ixgb
@@ -1000,7 +1042,7 @@
clean "rt2561.fwo"
rt2561.fw optional rt2561fw | ralfw \
dependency ".PHONY" \
- compile-with "uudecode < $S/contrib/dev/ral/rt2561.fw.uu" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
no-obj no-implicit-rule \
clean "rt2561.fw"
rt2561sfw.c optional rt2561sfw | ralfw \
@@ -1014,7 +1056,7 @@
clean "rt2561s.fwo"
rt2561s.fw optional rt2561sfw | ralfw \
dependency ".PHONY" \
- compile-with "uudecode < $S/contrib/dev/ral/rt2561s.fw.uu" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu" \
no-obj no-implicit-rule \
clean "rt2561s.fw"
rt2661fw.c optional rt2661fw | ralfw \
@@ -1028,7 +1070,7 @@
clean "rt2661.fwo"
rt2661.fw optional rt2661fw | ralfw \
dependency ".PHONY" \
- compile-with "uudecode < $S/contrib/dev/ral/rt2661.fw.uu" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \
no-obj no-implicit-rule \
clean "rt2661.fw"
rt2860fw.c optional rt2860fw | ralfw \
@@ -1042,7 +1084,7 @@
clean "rt2860.fwo"
rt2860.fw optional rt2860fw | ralfw \
dependency ".PHONY" \
- compile-with "uudecode < $S/contrib/dev/ral/rt2860.fw.uu" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \
no-obj no-implicit-rule \
clean "rt2860.fw"
dev/random/harvest.c standard
@@ -1318,7 +1360,7 @@
clean "wpi.fwo"
wpi.fw optional wpifw \
dependency ".PHONY" \
- compile-with "uudecode < $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu > ${.TARGET}" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu" \
no-obj no-implicit-rule \
clean "wpi.fw"
dev/xe/if_xe.c optional xe
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 04:36:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9A4181065672; Thu, 24 Apr 2008 04:36:59 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 5C514106566C
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 04:36:59 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 648B48FC1A
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 04:36:59 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3O4axvL099970
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 04:36:59 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3O4axek099968
for perforce@freebsd.org; Thu, 24 Apr 2008 04:36:59 GMT
(envelope-from pgj@FreeBSD.org)
Date: Thu, 24 Apr 2008 04:36:59 GMT
Message-Id: <200804240436.m3O4axek099968@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140497 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 04:36:59 -0000
http://perforce.freebsd.org/chv.cgi?CH=140497
Change 140497 by pgj@disznohal on 2008/04/24 04:36:09
Clean up mirrors: removed mirrors.xml because it should not
be here, and added transtable* to do things in the right way.
However, the dynamically generated sortkeys is not for
the Hungarian alphabet (the order of the countries is
wrong!), so something must be done about it.
(Modify some XSL files in doc/share/sgml to handle different
alphabets or give the opportunity to define sortkeys manually,
for example.)
Affected files ...
.. //depot/projects/docproj_hu/share/sgml/mirrors.xml#2 delete
.. //depot/projects/docproj_hu/share/sgml/transtable-local.xsl#1 add
.. //depot/projects/docproj_hu/share/sgml/transtable.xml#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 04:40:03 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0D9E81065670; Thu, 24 Apr 2008 04:40:03 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C2106106566B
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 04:40:02 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id CA3B08FC0A
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 04:40:02 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3O4e2Zo000142
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 04:40:02 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3O4e2tk000140
for perforce@freebsd.org; Thu, 24 Apr 2008 04:40:02 GMT
(envelope-from pgj@FreeBSD.org)
Date: Thu, 24 Apr 2008 04:40:02 GMT
Message-Id: <200804240440.m3O4e2tk000140@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140498 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 04:40:03 -0000
http://perforce.freebsd.org/chv.cgi?CH=140498
Change 140498 by pgj@disznohal on 2008/04/24 04:39:25
Remove my expirementations :)
Affected files ...
.. //depot/projects/docproj_hu/share/sgml/transtable.xml#2 edit
Differences ...
==== //depot/projects/docproj_hu/share/sgml/transtable.xml#2 (text+ko) ====
@@ -52,19 +52,16 @@
<word>
<orig>Central Servers</orig>
<tran>Központi szerverek</tran>
- <sortkey>99</sortkey>
</word>
<word>
<orig>Primary Mirror Sites</orig>
<tran>Elsõdleges tükrözések</tran>
- <sortkey>98</sortkey>
</word>
<word>
<orig>Argentina</orig>
<tran>Argentína</tran>
- <sortkey>97</sortkey>
</word>
<word>
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 13:29:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id E5C901065672; Thu, 24 Apr 2008 13:29:55 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 98424106564A
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 13:29:55 +0000 (UTC)
(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id A2E5D8FC12
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 13:29:55 +0000 (UTC)
(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3ODTtfL063068
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 13:29:55 GMT
(envelope-from diego@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3ODTteq063060
for perforce@freebsd.org; Thu, 24 Apr 2008 13:29:55 GMT
(envelope-from diego@FreeBSD.org)
Date: Thu, 24 Apr 2008 13:29:55 GMT
Message-Id: <200804241329.m3ODTteq063060@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
diego@FreeBSD.org using -f
From: Diego Giagio <diego@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140532 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 13:29:56 -0000
http://perforce.freebsd.org/chv.cgi?CH=140532
Change 140532 by diego@black on 2008/04/24 13:29:49
Initial branch import
Affected files ...
.. //depot/projects/soc2008/diego-audit/COPYRIGHT#1 branch
.. //depot/projects/soc2008/diego-audit/LOCKS#1 branch
.. //depot/projects/soc2008/diego-audit/MAINTAINERS#1 branch
.. //depot/projects/soc2008/diego-audit/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/Makefile.inc1#1 branch
.. //depot/projects/soc2008/diego-audit/ObsoleteFiles.inc#1 branch
.. //depot/projects/soc2008/diego-audit/UPDATING#1 branch
.. //depot/projects/soc2008/diego-audit/bin/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/Makefile.inc#1 branch
.. //depot/projects/soc2008/diego-audit/bin/cat/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/cat/cat.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/cat/cat.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chflags/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chflags/chflags.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chflags/chflags.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chio/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chio/chio.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chio/chio.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chio/defs.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chio/pathnames.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chmod/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chmod/chmod.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/chmod/chmod.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/cp/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/cp/cp.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/cp/cp.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/cp/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/cp/utils.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.2#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.3#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.4#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.a#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.g#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/tabs#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/config.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/config_p.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/host.defs#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/iconv.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/csh/iconv_stub.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/date/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/date/date.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/date/date.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/date/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/date/netdate.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/date/vary.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/date/vary.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/args.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/conv.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/conv_tab.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/dd.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/dd.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/dd.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/gen.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/misc.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/position.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.ascii#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.ebcdic#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.ibm#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.lcase#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.oldascii#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.oldebcdic#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.oldibm#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.pareven#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.parnone#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.parodd#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.parset#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.swab#1 branch
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.ucase#1 branch
.. //depot/projects/soc2008/diego-audit/bin/df/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/df/df.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/df/df.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/domainname/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/domainname/domainname.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/domainname/domainname.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/echo/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/echo/echo.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/echo/echo.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/POSIX#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/README#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/buf.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/cbc.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/ed.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/ed.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/glbl.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/io.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/main.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/re.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/sub.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/=.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/README#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/TODO#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/ascii.d.uu#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/ascii.r.uu#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/ascii.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang1.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang1.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang1.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/ckscripts.sh#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/d.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/d.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/d.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/d.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e1.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e1.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e1.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e2.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e2.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e2.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e3.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e3.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e3.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e3.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e4.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e4.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e4.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/f1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/f2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g1.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g1.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g1.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g2.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g2.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g2.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g3.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g3.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g3.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g3.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g4.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g4.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g4.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g5.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g5.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g5.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/h.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i3.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/j.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/j.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/j.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k3.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k4.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/l.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/l.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/l.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/m.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/m.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/m.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/m.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/mkscripts.sh#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/n.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/n.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/n.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl1.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl1.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl1.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl2.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl2.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl2.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/p.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/p.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/p.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/q.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/q.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/q.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/q1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r1.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r1.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r1.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r2.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r2.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r2.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r3.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r3.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r3.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s1.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s1.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s1.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s10.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s2.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s2.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s2.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s3.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s3.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s3.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s3.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s4.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s5.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s6.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s7.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s8.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s9.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t1.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t1.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t1.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t2.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t2.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t2.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/u.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/u.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/u.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/u.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/v.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/v.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/v.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w.d#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w.r#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w.t#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w1.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w2.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w3.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/x.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/test/z.err#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ed/undo.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/expr/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/expr/expr.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/expr/expr.y#1 branch
.. //depot/projects/soc2008/diego-audit/bin/getfacl/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/getfacl/getfacl.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/getfacl/getfacl.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/hostname/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/hostname/hostname.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/hostname/hostname.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/kenv/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/kenv/kenv.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/kenv/kenv.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/kill/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/kill/kill.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/kill/kill.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ln/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ln/ln.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ln/ln.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ln/symlink.7#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ls/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ls/cmp.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ls/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ls/ls.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ls/ls.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ls/ls.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ls/print.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ls/util.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/mkdir/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/mkdir/mkdir.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/mkdir/mkdir.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/mv/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/mv/mv.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/mv/mv.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/ar_io.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/ar_subs.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/buf_subs.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/cache.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/cache.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/cpio.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/cpio.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/cpio.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/file_subs.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/ftree.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/ftree.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/gen_subs.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/getoldopt.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/options.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/options.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/pat_rep.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/pat_rep.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/pax.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/pax.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/pax.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/sel_subs.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/sel_subs.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/tables.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/tables.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/tar.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/tar.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/tar.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pax/tty_subs.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ps/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ps/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ps/fmt.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ps/keyword.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ps/nlist.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ps/print.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ps/ps.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ps/ps.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/ps/ps.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pwd/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pwd/pwd.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/pwd/pwd.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rcp/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rcp/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rcp/rcp.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rcp/rcp.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rcp/util.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/realpath/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/realpath/realpath.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/realpath/realpath.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rm/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rm/rm.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rm/rm.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rmail/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rmdir/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rmdir/rmdir.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/rmdir/rmdir.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/setfacl/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/setfacl/file.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/setfacl/mask.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/setfacl/merge.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/setfacl/remove.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/setfacl/setfacl.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/setfacl/setfacl.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/setfacl/setfacl.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/setfacl/util.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/TOUR#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/alias.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/alias.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/arith.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/arith.y#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/arith_lex.l#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/bltin/bltin.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/bltin/echo.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/bltin/echo.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/builtins.def#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/cd.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/cd.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/error.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/error.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/eval.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/eval.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/exec.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/exec.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/expand.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/expand.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/cmv#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/dirs#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/kill#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/login#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/newgrp#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/popd#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/pushd#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/suspend#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/histedit.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/init.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/input.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/input.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/jobs.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/jobs.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/mail.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/mail.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/main.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/main.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/memalloc.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/memalloc.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/miscbltin.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/mkbuiltins#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/mkinit.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/mknodes.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/mksyntax.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/mktokens#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/myhistedit.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/mystring.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/mystring.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/nodes.c.pat#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/nodetypes#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/options.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/options.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/output.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/output.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/parser.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/parser.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/redir.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/redir.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/sh.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/shell.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/show.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/show.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/trap.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/trap.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/var.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sh/var.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sleep/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sleep/sleep.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sleep/sleep.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/cchar.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/gfmt.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/key.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/modes.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/print.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/stty.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/stty.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/stty.h#1 branch
.. //depot/projects/soc2008/diego-audit/bin/stty/util.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sync/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sync/sync.8#1 branch
.. //depot/projects/soc2008/diego-audit/bin/sync/sync.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/test/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/test/TEST.README#1 branch
.. //depot/projects/soc2008/diego-audit/bin/test/TEST.csh#1 branch
.. //depot/projects/soc2008/diego-audit/bin/test/TEST.sh#1 branch
.. //depot/projects/soc2008/diego-audit/bin/test/test.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/test/test.c#1 branch
.. //depot/projects/soc2008/diego-audit/bin/uuidgen/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/bin/uuidgen/uuidgen.1#1 branch
.. //depot/projects/soc2008/diego-audit/bin/uuidgen/uuidgen.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/Makefile.inc#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/alloca.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/devid.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/fcntl.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/fsshare.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/libintl.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/mnttab.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/priv.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/solaris.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/stdio.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/stdlib.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/strings.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/unistd.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/zone.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/lib/libumem/umem.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/lib/libumem/umem.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/deviceid.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/fsshare.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/mkdirp.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/mnttab.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/zmount.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/zone.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zdb/zdb.8#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zdb/zdb.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs.8#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool.8#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/ztest/ztest.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/assert.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/atomic.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/libintl.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/stdio_ext.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/synch.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/thread.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzpool/common/util.c#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/lib/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/lib/Makefile.inc#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/lib/libavl/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/lib/libnvpair/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/lib/libumem/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/lib/libuutil/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/lib/libzfs/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/lib/libzpool/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/sbin/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/sbin/Makefile.inc#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/sbin/zfs/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/sbin/zpool/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/usr.bin/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/usr.bin/Makefile.inc#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/usr.bin/ztest/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/usr.sbin/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/usr.sbin/Makefile.inc#1 branch
.. //depot/projects/soc2008/diego-audit/cddl/usr.sbin/zdb/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/AUTHORS#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/BUGS#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/COPYING#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/ChangeLog#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/FAQ#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/FREEBSD-Xlist#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/FREEBSD-upgrade#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/INSTALL#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/MIRRORS.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/MIRRORS.txt#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/NEWS#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/README#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/README.attrcache#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/README.ldap#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/README.y2k#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/am_ops.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amd.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amd.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amd.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_auto.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_direct.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_error.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_generic.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_host.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_link.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_linkx.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_nfsl.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_nfsx.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_program.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_root.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_toplvl.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_union.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amq_subr.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amq_svc.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/autil.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/clock.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/conf.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/conf_parse.y#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/conf_tok.l#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/get_args.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_exec.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_file.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_hesiod.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_ldap.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_ndbm.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_nis.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_nisplus.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_passwd.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_union.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/map.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/mapc.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/mntfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/nfs_prot_svc.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/nfs_start.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/nfs_subr.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_TEMPLATE.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_cachefs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_cdfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_efs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_lofs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_mfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_nfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_nfs3.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_nullfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_pcfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_tfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_tmpfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_ufs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_umapfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_unionfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_xfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/opts.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/readdir.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/restart.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/rpc_fwd.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/sched.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/srvr_amfs_auto.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/srvr_nfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq_clnt.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq_xdr.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/pawd.1#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/pawd.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/aux_conf.h.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/bootstrap#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/checkmount/checkmount_bsd44.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/mtab/mtab_bsd.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/transp/transp_sockets.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/trap/trap_default.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/umount/umount_bsd44.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/doc/am-utils.texi#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/doc/stamp-vti#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/doc/texinfo.tex#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/doc/version.texi#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fixmount/fixmount.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fixmount/fixmount.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_analyze.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_data.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_dict.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_gram.y#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_lex.l#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_util.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsinfo.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsinfo.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsinfo.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_atab.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_bparam.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_dumpset.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_exportfs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_fstab.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/hlfsd.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/hlfsd.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/hlfsd.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/homedir.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/nfs_prot_svc.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/stubs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/am_compat.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/am_defs.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/am_utils.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/am_xdr_func.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/amq_defs.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/mount_headers1.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/mount_headers2.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/ldap-id.ms#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/ldap-id.txt#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/ldap.schema#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/amu.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/hasmntopt.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/misc_rpc.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/mount_fs.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/mtab.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/nfs_prot_xdr.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/strerror.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/strutil.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/wire.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/xdr_func.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/xutil.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/mk-amd-map/mk-amd-map.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/mk-amd-map/mk-amd-map.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/am-eject.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/amd.conf-sample#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/amd.conf.5#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/amd2ldif.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/amd2sun.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/automount2amd.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/automount2amd.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/ctl-amd.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/ctl-hlfsd.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/expn.1#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/expn.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/fix-amd-map.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/fixrmtab.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/redhat-ctl-amd.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/test-attrcache.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/wait4amd.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/wait4amd2die.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/tasks#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/vers.m4#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/wire-test/wire-test.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/amd/wire-test/wire-test.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/AUTHORS#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/ChangeLog#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Examples/ckbook.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Examples/pi.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Examples/primes.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Examples/twins.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/FAQ#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/FREEBSD-upgrade#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/INSTALL#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/NEWS#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/README#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/BUG.bc#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/array.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/arrayp.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/aryprm.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/atan.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/checklib.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/div.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/exp.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/fact.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/jn.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/ln.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/mul.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/raise.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/signum#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/sine.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/sqrt.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/sqrt1.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/sqrt2.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/testfn.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/timetest#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/acconfig.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/aclocal.m4#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/bc.y#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/bcdefs.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/const.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/execute.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/fix-libmath_h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/global.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/global.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/libmath.b#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/libmath.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/load.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/main.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/proto.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/sbc.y#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/scan.l#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/storage.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/util.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/config.h.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/configure#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/configure.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/array.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/dc-proto.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/dc-regdef.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/dc.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/dc.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/eval.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/misc.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/numeric.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/stack.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/string.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/bc.1#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/bc.texi#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/dc.1#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/dc.texi#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/h/number.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/install-sh#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/Makefile.am#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/number.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/testmul.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/vfprintf.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/missing#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/mkinstalldirs#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bc/stamp-h.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/CHANGES#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/COPYRIGHT#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/FAQ#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/FAQ.xml#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/FREEBSD-Upgrade#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/FREEBSD-Xlist#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/README#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/README.idnkit#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/acconfig.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/check-tool.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/check-tool.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkconf.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkconf.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkconf.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkconf.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkzone.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkzone.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkzone.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkzone.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dig.1#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dig.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dig.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dig.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dighost.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/host.1#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/host.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/host.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/host.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/include/dig/dig.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/nslookup.1#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/nslookup.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/nslookup.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/nslookup.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-keygen.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-keygen.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-keygen.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-signzone.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-signzone.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-signzone.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssectool.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssectool.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/builtin.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/client.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/config.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/control.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/controlconf.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/builtin.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/client.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/config.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/control.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/globals.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/interfacemgr.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/listenlist.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/log.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/logconf.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/lwaddr.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/lwdclient.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/lwresd.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/lwsearch.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/main.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/notify.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/ns_smf_globals.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/query.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/server.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/sortlist.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/tkeyconf.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/tsigconf.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/types.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/update.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/xfrout.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/zoneconf.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/interfacemgr.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/listenlist.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/log.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/logconf.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwaddr.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdclient.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwderror.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdgabn.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdgnba.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdgrbn.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdnoop.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwresd.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwresd.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwresd.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwresd.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwsearch.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/main.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.conf.5#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.conf.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.conf.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/notify.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/query.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/server.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/sortlist.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/tkeyconf.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/tsigconf.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/unix/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/unix/include/named/os.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/unix/os.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/update.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/xfrout.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/zoneconf.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/nsupdate.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/nsupdate.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/nsupdate.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/nsupdate.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/include/rndc/os.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc-confgen.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc-confgen.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc-confgen.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc-confgen.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.8#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.conf#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.conf.5#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.conf.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.conf.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.docbook#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.html#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/unix/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/unix/os.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/util.c#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/util.h#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/config.guess#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/config.sub#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/config.threads.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/configure.in#1 branch
.. //depot/projects/soc2008/diego-audit/contrib/bind9/doc/Makefile.in#1 branch
.. //depot/projects/soc2008/diego-audit/src/COPYRIGHT#1 branch
.. //depot/projects/soc2008/diego-audit/src/LOCKS#1 branch
.. //depot/projects/soc2008/diego-audit/src/MAINTAINERS#1 branch
.. //depot/projects/soc2008/diego-audit/src/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/Makefile.inc1#1 branch
.. //depot/projects/soc2008/diego-audit/src/ObsoleteFiles.inc#1 branch
.. //depot/projects/soc2008/diego-audit/src/README#1 branch
.. //depot/projects/soc2008/diego-audit/src/UPDATING#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/Makefile.inc#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/cat/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/cat/cat.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/cat/cat.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chflags/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chflags/chflags.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chflags/chflags.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chio/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chio/chio.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chio/chio.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chio/defs.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chio/pathnames.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chmod/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chmod/chmod.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/chmod/chmod.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/cp/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/cp/cp.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/cp/cp.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/cp/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/cp/utils.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.2#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.3#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.4#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.a#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.g#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/tabs#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/config.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/config_p.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/host.defs#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/iconv.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/csh/iconv_stub.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/date/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/date/date.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/date/date.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/date/extern.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/date/netdate.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/date/vary.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/date/vary.h#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/dd/Makefile#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/dd/args.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/dd/conv.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/dd/conv_tab.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/dd/dd.1#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/dd/dd.c#1 branch
.. //depot/projects/soc2008/diego-audit/src/bin/dd/dd.h#1 branch
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 15:52:25 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id A02301065676; Thu, 24 Apr 2008 15:52:25 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 25F781065673
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 15:52:25 +0000 (UTC)
(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 2CD7A8FC26
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 15:52:25 +0000 (UTC)
(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3OFqPjx080638
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 15:52:25 GMT
(envelope-from diego@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3OFqO8l080636
for perforce@freebsd.org; Thu, 24 Apr 2008 15:52:24 GMT
(envelope-from diego@FreeBSD.org)
Date: Thu, 24 Apr 2008 15:52:24 GMT
Message-Id: <200804241552.m3OFqO8l080636@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
diego@FreeBSD.org using -f
From: Diego Giagio <diego@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140538 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 15:52:26 -0000
http://perforce.freebsd.org/chv.cgi?CH=140538
Change 140538 by diego@black on 2008/04/24 15:52:11
Removal of uneeded files, created by wrong mapping
Affected files ...
.. //depot/projects/soc2008/diego-audit/COPYRIGHT#2 delete
.. //depot/projects/soc2008/diego-audit/LOCKS#2 delete
.. //depot/projects/soc2008/diego-audit/MAINTAINERS#2 delete
.. //depot/projects/soc2008/diego-audit/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/Makefile.inc1#2 delete
.. //depot/projects/soc2008/diego-audit/ObsoleteFiles.inc#2 delete
.. //depot/projects/soc2008/diego-audit/UPDATING#2 delete
.. //depot/projects/soc2008/diego-audit/bin/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/Makefile.inc#2 delete
.. //depot/projects/soc2008/diego-audit/bin/cat/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/cat/cat.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/cat/cat.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chflags/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chflags/chflags.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chflags/chflags.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chio/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chio/chio.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chio/chio.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chio/defs.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chio/pathnames.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chmod/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chmod/chmod.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/chmod/chmod.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/cp/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/cp/cp.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/cp/cp.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/cp/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/cp/utils.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.2#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.3#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.4#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.a#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/csh.g#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/USD.doc/tabs#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/config.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/config_p.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/host.defs#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/iconv.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/csh/iconv_stub.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/date/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/date/date.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/date/date.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/date/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/date/netdate.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/date/vary.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/date/vary.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/args.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/conv.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/conv_tab.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/dd.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/dd.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/dd.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/gen.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/misc.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/position.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.ascii#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.ebcdic#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.ibm#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.lcase#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.oldascii#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.oldebcdic#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.oldibm#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.pareven#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.parnone#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.parodd#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.parset#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.swab#2 delete
.. //depot/projects/soc2008/diego-audit/bin/dd/ref.ucase#2 delete
.. //depot/projects/soc2008/diego-audit/bin/df/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/df/df.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/df/df.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/domainname/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/domainname/domainname.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/domainname/domainname.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/echo/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/echo/echo.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/echo/echo.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/POSIX#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/README#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/buf.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/cbc.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/ed.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/ed.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/glbl.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/io.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/main.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/re.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/sub.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/=.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/README#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/TODO#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/a2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/addr2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/ascii.d.uu#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/ascii.r.uu#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/ascii.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang1.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang1.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang1.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/bang2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/c2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/ckscripts.sh#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/d.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/d.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/d.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/d.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e1.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e1.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e1.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e2.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e2.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e2.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e3.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e3.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e3.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e3.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e4.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e4.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/e4.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/f1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/f2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g1.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g1.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g1.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g2.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g2.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g2.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g3.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g3.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g3.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g3.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g4.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g4.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g4.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g5.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g5.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/g5.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/h.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/i3.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/j.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/j.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/j.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k3.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/k4.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/l.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/l.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/l.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/m.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/m.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/m.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/m.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/mkscripts.sh#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/n.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/n.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/n.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl1.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl1.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl1.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl2.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl2.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/nl2.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/p.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/p.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/p.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/q.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/q.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/q.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/q1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r1.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r1.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r1.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r2.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r2.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r2.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r3.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r3.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/r3.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s1.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s1.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s1.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s10.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s2.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s2.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s2.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s3.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s3.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s3.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s3.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s4.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s5.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s6.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s7.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s8.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/s9.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t1.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t1.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t1.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t2.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t2.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/t2.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/u.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/u.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/u.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/u.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/v.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/v.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/v.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w.d#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w.r#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w.t#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w1.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w2.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/w3.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/x.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/test/z.err#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ed/undo.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/expr/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/expr/expr.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/expr/expr.y#2 delete
.. //depot/projects/soc2008/diego-audit/bin/getfacl/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/getfacl/getfacl.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/getfacl/getfacl.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/hostname/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/hostname/hostname.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/hostname/hostname.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/kenv/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/kenv/kenv.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/kenv/kenv.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/kill/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/kill/kill.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/kill/kill.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ln/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ln/ln.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ln/ln.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ln/symlink.7#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ls/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ls/cmp.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ls/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ls/ls.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ls/ls.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ls/ls.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ls/print.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ls/util.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/mkdir/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/mkdir/mkdir.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/mkdir/mkdir.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/mv/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/mv/mv.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/mv/mv.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/ar_io.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/ar_subs.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/buf_subs.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/cache.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/cache.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/cpio.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/cpio.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/cpio.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/file_subs.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/ftree.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/ftree.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/gen_subs.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/getoldopt.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/options.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/options.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/pat_rep.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/pat_rep.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/pax.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/pax.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/pax.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/sel_subs.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/sel_subs.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/tables.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/tables.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/tar.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/tar.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/tar.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pax/tty_subs.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ps/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ps/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ps/fmt.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ps/keyword.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ps/nlist.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ps/print.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ps/ps.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ps/ps.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/ps/ps.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pwd/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pwd/pwd.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/pwd/pwd.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rcp/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rcp/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rcp/rcp.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rcp/rcp.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rcp/util.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/realpath/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/realpath/realpath.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/realpath/realpath.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rm/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rm/rm.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rm/rm.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rmail/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rmdir/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rmdir/rmdir.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/rmdir/rmdir.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/setfacl/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/setfacl/file.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/setfacl/mask.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/setfacl/merge.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/setfacl/remove.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/setfacl/setfacl.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/setfacl/setfacl.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/setfacl/setfacl.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/setfacl/util.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/TOUR#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/alias.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/alias.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/arith.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/arith.y#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/arith_lex.l#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/bltin/bltin.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/bltin/echo.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/bltin/echo.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/builtins.def#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/cd.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/cd.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/error.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/error.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/eval.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/eval.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/exec.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/exec.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/expand.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/expand.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/cmv#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/dirs#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/kill#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/login#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/newgrp#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/popd#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/pushd#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/funcs/suspend#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/histedit.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/init.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/input.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/input.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/jobs.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/jobs.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/mail.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/mail.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/main.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/main.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/memalloc.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/memalloc.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/miscbltin.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/mkbuiltins#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/mkinit.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/mknodes.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/mksyntax.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/mktokens#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/myhistedit.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/mystring.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/mystring.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/nodes.c.pat#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/nodetypes#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/options.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/options.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/output.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/output.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/parser.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/parser.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/redir.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/redir.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/sh.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/shell.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/show.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/show.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/trap.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/trap.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/var.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sh/var.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sleep/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sleep/sleep.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sleep/sleep.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/cchar.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/gfmt.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/key.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/modes.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/print.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/stty.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/stty.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/stty.h#2 delete
.. //depot/projects/soc2008/diego-audit/bin/stty/util.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sync/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sync/sync.8#2 delete
.. //depot/projects/soc2008/diego-audit/bin/sync/sync.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/test/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/test/TEST.README#2 delete
.. //depot/projects/soc2008/diego-audit/bin/test/TEST.csh#2 delete
.. //depot/projects/soc2008/diego-audit/bin/test/TEST.sh#2 delete
.. //depot/projects/soc2008/diego-audit/bin/test/test.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/test/test.c#2 delete
.. //depot/projects/soc2008/diego-audit/bin/uuidgen/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/bin/uuidgen/uuidgen.1#2 delete
.. //depot/projects/soc2008/diego-audit/bin/uuidgen/uuidgen.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/Makefile.inc#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/alloca.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/devid.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/fcntl.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/fsshare.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/libintl.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/mnttab.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/priv.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/solaris.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/stdio.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/stdlib.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/strings.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/unistd.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/include/zone.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/lib/libumem/umem.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/lib/libumem/umem.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/deviceid.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/fsshare.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/mkdirp.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/mnttab.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/zmount.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/compat/opensolaris/misc/zone.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/OPENSOLARIS.LICENSE#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zdb/zdb.8#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zdb/zdb.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zdb/zdb_il.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs_iter.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs_main.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zfs/zfs_util.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool.8#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_iter.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_main.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_util.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_util.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/zpool/zpool_vdev.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/cmd/ztest/ztest.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/assert.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/atomic.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/libintl.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/stdio_ext.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/synch.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/head/thread.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libnvpair/libnvpair.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libnvpair/nvpair_alloc_system.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/libuutil.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_common.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/libuutil_impl.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_alloc.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_avl.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_dprintf.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_ident.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_list.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_misc.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_open.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_pname.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libuutil/common/uu_strtoint.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_config.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_dataset.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_graph.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_impl.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_import.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_mount.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_pool.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_status.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzfs/common/libzfs_util.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzpool/common/kernel.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzpool/common/sys/zfs_context.h#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzpool/common/taskq.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/contrib/opensolaris/lib/libzpool/common/util.c#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/lib/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/lib/Makefile.inc#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/lib/libavl/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/lib/libnvpair/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/lib/libumem/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/lib/libuutil/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/lib/libzfs/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/lib/libzpool/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/sbin/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/sbin/Makefile.inc#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/sbin/zfs/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/sbin/zpool/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/usr.bin/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/usr.bin/Makefile.inc#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/usr.bin/ztest/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/usr.sbin/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/usr.sbin/Makefile.inc#2 delete
.. //depot/projects/soc2008/diego-audit/cddl/usr.sbin/zdb/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/AUTHORS#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/BUGS#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/COPYING#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/ChangeLog#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/FAQ#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/FREEBSD-Xlist#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/FREEBSD-upgrade#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/INSTALL#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/MIRRORS.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/MIRRORS.txt#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/NEWS#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/README#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/README.attrcache#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/README.ldap#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/README.y2k#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/am_ops.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amd.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amd.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amd.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_auto.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_direct.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_error.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_generic.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_host.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_link.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_linkx.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_nfsl.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_nfsx.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_program.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_root.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_toplvl.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amfs_union.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amq_subr.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/amq_svc.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/autil.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/clock.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/conf.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/conf_parse.y#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/conf_tok.l#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/get_args.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_exec.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_file.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_hesiod.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_ldap.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_ndbm.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_nis.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_nisplus.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_passwd.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/info_union.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/map.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/mapc.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/mntfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/nfs_prot_svc.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/nfs_start.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/nfs_subr.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_TEMPLATE.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_cachefs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_cdfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_efs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_lofs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_mfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_nfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_nfs3.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_nullfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_pcfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_tfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_tmpfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_ufs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_umapfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_unionfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/ops_xfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/opts.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/readdir.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/restart.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/rpc_fwd.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/sched.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/srvr_amfs_auto.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amd/srvr_nfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq_clnt.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/amq_xdr.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/pawd.1#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/amq/pawd.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/aux_conf.h.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/bootstrap#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/checkmount/checkmount_bsd44.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/fh_dref/fh_dref_freebsd22.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/mtab/mtab_bsd.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/nfs_prot/nfs_prot_freebsd2.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/nfs_prot/nfs_prot_freebsd3.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/sa_dref/sa_dref_bsd44.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/transp/transp_sockets.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/trap/trap_default.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/conf/umount/umount_bsd44.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/doc/am-utils.texi#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/doc/stamp-vti#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/doc/texinfo.tex#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/doc/version.texi#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fixmount/fixmount.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fixmount/fixmount.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_analyze.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_data.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_dict.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_gram.y#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_lex.l#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsi_util.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsinfo.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsinfo.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/fsinfo.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_atab.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_bparam.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_dumpset.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_exportfs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/fsinfo/wr_fstab.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/hlfsd.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/hlfsd.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/hlfsd.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/homedir.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/nfs_prot_svc.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/hlfsd/stubs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/am_compat.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/am_defs.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/am_utils.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/am_xdr_func.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/amq_defs.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/mount_headers1.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/include/mount_headers2.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/ldap-id.ms#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/ldap-id.txt#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/ldap.schema#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/amu.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/hasmntopt.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/misc_rpc.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/mount_fs.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/mtab.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/nfs_prot_xdr.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/strerror.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/strutil.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/wire.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/xdr_func.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/libamu/xutil.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/mk-amd-map/mk-amd-map.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/mk-amd-map/mk-amd-map.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/Makefile.am#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/am-eject.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/amd.conf-sample#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/amd.conf.5#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/amd2ldif.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/amd2sun.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/automount2amd.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/automount2amd.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/ctl-amd.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/ctl-hlfsd.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/expn.1#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/expn.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/fix-amd-map.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/fixrmtab.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/redhat-ctl-amd.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/test-attrcache.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/wait4amd.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/scripts/wait4amd2die.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/tasks#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/vers.m4#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/wire-test/wire-test.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/amd/wire-test/wire-test.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/AUTHORS#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/ChangeLog#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Examples/ckbook.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Examples/pi.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Examples/primes.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Examples/twins.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/FAQ#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/FREEBSD-upgrade#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/INSTALL#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Makefile.am#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/NEWS#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/README#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/BUG.bc#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/array.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/arrayp.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/aryprm.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/atan.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/checklib.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/div.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/exp.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/fact.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/jn.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/ln.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/mul.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/raise.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/signum#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/sine.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/sqrt.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/sqrt1.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/sqrt2.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/testfn.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/Test/timetest#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/acconfig.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/aclocal.m4#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/Makefile.am#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/bc.y#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/bcdefs.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/const.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/execute.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/fix-libmath_h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/global.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/global.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/libmath.b#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/libmath.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/load.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/main.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/proto.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/sbc.y#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/scan.l#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/storage.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/bc/util.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/config.h.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/configure#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/configure.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/Makefile.am#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/array.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/dc-proto.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/dc-regdef.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/dc.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/dc.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/eval.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/misc.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/numeric.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/stack.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/dc/string.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/Makefile.am#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/bc.1#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/bc.texi#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/dc.1#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/doc/dc.texi#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/h/number.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/install-sh#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/Makefile.am#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/number.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/testmul.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/lib/vfprintf.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/missing#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/mkinstalldirs#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bc/stamp-h.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/CHANGES#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/COPYRIGHT#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/FAQ#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/FAQ.xml#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/FREEBSD-Upgrade#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/FREEBSD-Xlist#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/README#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/README.idnkit#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/acconfig.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/check-tool.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/check-tool.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkconf.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkconf.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkconf.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkconf.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkzone.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkzone.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkzone.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/check/named-checkzone.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dig.1#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dig.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dig.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dig.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/dighost.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/host.1#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/host.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/host.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/host.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/include/dig/dig.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/nslookup.1#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/nslookup.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/nslookup.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dig/nslookup.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-keygen.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-keygen.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-keygen.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-keygen.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-signzone.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-signzone.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-signzone.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssec-signzone.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssectool.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/dnssec/dnssectool.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/builtin.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/client.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/config.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/control.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/controlconf.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/builtin.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/client.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/config.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/control.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/globals.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/interfacemgr.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/listenlist.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/log.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/logconf.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/lwaddr.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/lwdclient.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/lwresd.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/lwsearch.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/main.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/notify.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/ns_smf_globals.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/query.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/server.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/sortlist.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/tkeyconf.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/tsigconf.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/types.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/update.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/xfrout.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/include/named/zoneconf.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/interfacemgr.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/listenlist.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/log.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/logconf.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwaddr.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdclient.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwderror.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdgabn.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdgnba.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdgrbn.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwdnoop.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwresd.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwresd.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwresd.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwresd.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/lwsearch.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/main.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.conf.5#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.conf.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.conf.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/named.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/notify.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/query.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/server.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/sortlist.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/tkeyconf.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/tsigconf.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/unix/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/unix/include/named/os.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/unix/os.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/update.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/xfrout.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/named/zoneconf.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/nsupdate.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/nsupdate.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/nsupdate.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/nsupdate/nsupdate.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/include/rndc/os.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc-confgen.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc-confgen.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc-confgen.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc-confgen.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.8#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.conf#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.conf.5#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.conf.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.conf.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.docbook#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/rndc.html#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/unix/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/unix/os.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/util.c#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/bin/rndc/util.h#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/config.guess#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/config.sub#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/config.threads.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/configure.in#2 delete
.. //depot/projects/soc2008/diego-audit/contrib/bind9/doc/Makefile.in#2 delete
.. //depot/projects/soc2008/diego-audit/src/COPYRIGHT#2 delete
.. //depot/projects/soc2008/diego-audit/src/LOCKS#2 delete
.. //depot/projects/soc2008/diego-audit/src/MAINTAINERS#2 delete
.. //depot/projects/soc2008/diego-audit/src/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/Makefile.inc1#2 delete
.. //depot/projects/soc2008/diego-audit/src/ObsoleteFiles.inc#2 delete
.. //depot/projects/soc2008/diego-audit/src/README#2 delete
.. //depot/projects/soc2008/diego-audit/src/UPDATING#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/Makefile.inc#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/cat/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/cat/cat.1#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/cat/cat.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chflags/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chflags/chflags.1#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chflags/chflags.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chio/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chio/chio.1#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chio/chio.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chio/defs.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chio/pathnames.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chmod/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chmod/chmod.1#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/chmod/chmod.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/cp/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/cp/cp.1#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/cp/cp.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/cp/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/cp/utils.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.1#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.2#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.3#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.4#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.a#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/csh.g#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/USD.doc/tabs#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/config.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/config_p.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/host.defs#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/iconv.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/csh/iconv_stub.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/date/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/date/date.1#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/date/date.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/date/extern.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/date/netdate.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/date/vary.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/date/vary.h#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/dd/Makefile#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/dd/args.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/dd/conv.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/dd/conv_tab.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/dd/dd.1#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/dd/dd.c#2 delete
.. //depot/projects/soc2008/diego-audit/src/bin/dd/dd.h#2 delete
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 18:08:48 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0579D1065674; Thu, 24 Apr 2008 18:08:48 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id BFC55106566B
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 18:08:47 +0000 (UTC)
(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id ACA768FC17
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 18:08:47 +0000 (UTC)
(envelope-from konrad@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3OI8loZ099863
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 18:08:47 GMT
(envelope-from konrad@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3OI8ltR099861
for perforce@freebsd.org; Thu, 24 Apr 2008 18:08:47 GMT
(envelope-from konrad@FreeBSD.org)
Date: Thu, 24 Apr 2008 18:08:47 GMT
Message-Id: <200804241808.m3OI8ltR099861@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
konrad@FreeBSD.org using -f
From: Konrad Jankowski <konrad@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140540 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 18:08:48 -0000
http://perforce.freebsd.org/chv.cgi?CH=140540
Change 140540 by konrad@vspredator on 2008/04/24 18:08:44
Initial add. Testing p4.
Affected files ...
.. //depot/projects/soc2008/konrad_collation/README#1 add
Differences ...
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 18:25:04 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id AAAC41065673; Thu, 24 Apr 2008 18:25:04 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 6CBE9106566B
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 18:25:04 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 726F88FC12
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 18:25:04 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3OIP4or001067
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 18:25:04 GMT
(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3OIP4jR001065
for perforce@freebsd.org; Thu, 24 Apr 2008 18:25:04 GMT
(envelope-from gonzo@FreeBSD.org)
Date: Thu, 24 Apr 2008 18:25:04 GMT
Message-Id: <200804241825.m3OIP4jR001065@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140541 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 18:25:05 -0000
http://perforce.freebsd.org/chv.cgi?CH=140541
Change 140541 by gonzo@gonzo_jeeves on 2008/04/24 18:25:02
o ld script states that entry point is __start and not _start. Without
it entry point defaults to the start of .text section where __main
is located. That's no good.
Affected files ...
.. //depot/projects/mips2-jnpr/src/lib/csu/mips/crt1.c#3 edit
Differences ...
==== //depot/projects/mips2-jnpr/src/lib/csu/mips/crt1.c#3 (text+ko) ====
@@ -71,7 +71,7 @@
/* The entry function. */
void
-_start(char **ap,
+__start(char **ap,
void (*cleanup)(void), /* from shared loader */
struct Struct_Obj_Entry *obj, /* from shared loader */
struct ps_strings *ps_strings)
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 20:51:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 556761065676; Thu, 24 Apr 2008 20:51:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 180D61065670
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 20:51:11 +0000 (UTC)
(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 19A518FC22
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 20:51:11 +0000 (UTC)
(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3OKpAN7033708
for <perforce@FreeBSD.org>; Thu, 24 Apr 2008 20:51:10 GMT
(envelope-from snagg@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3OKpALw033702
for perforce@freebsd.org; Thu, 24 Apr 2008 20:51:10 GMT
(envelope-from snagg@FreeBSD.org)
Date: Thu, 24 Apr 2008 20:51:10 GMT
Message-Id: <200804242051.m3OKpALw033702@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
snagg@FreeBSD.org using -f
From: Vincenzo Iozzo <snagg@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140547 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 20:51:11 -0000
http://perforce.freebsd.org/chv.cgi?CH=140547
Change 140547 by snagg@snagg_macosx on 2008/04/24 20:50:10
Affected files ...
.. //depot/projects/soc2008/snagg-audit/sys/kern/vfs_subr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/security/audit/audit.h#2 integrate
Differences ...
==== //depot/projects/soc2008/snagg-audit/sys/kern/vfs_subr.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.728 2008/04/16 11:33:31 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_subr.c,v 1.729 2008/04/24 09:58:33 kib Exp $");
#include "opt_ddb.h"
#include "opt_mac.h"
@@ -311,9 +311,9 @@
TAILQ_INIT(&vnode_free_list);
mtx_init(&vnode_free_list_mtx, "vnode_free_list", NULL, MTX_DEF);
vnode_zone = uma_zcreate("VNODE", sizeof (struct vnode), NULL, NULL,
- NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
+ NULL, NULL, UMA_ALIGN_PTR, 0);
vnodepoll_zone = uma_zcreate("VNODEPOLL", sizeof (struct vpollinfo),
- NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_NOFREE);
+ NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
/*
* Initialize the filesystem syncer.
*/
==== //depot/projects/soc2008/snagg-audit/sys/net/radix_mpath.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net/radix_mpath.c,v 1.3 2008/04/13 23:04:46 qingli Exp $");
+__FBSDID("$FreeBSD: src/sys/net/radix_mpath.c,v 1.4 2008/04/24 05:04:52 qingli Exp $");
#include "opt_inet6.h"
@@ -269,7 +269,9 @@
ro->ro_rt = rtalloc1(&ro->ro_dst, 1, 0UL);
/* if the route does not exist or it is not multipath, don't care */
- if (!ro->ro_rt || !rn_mpath_next((struct radix_node *)ro->ro_rt)) {
+ if (ro->ro_rt == NULL)
+ return;
+ if (rn_mpath_next((struct radix_node *)ro->ro_rt) == NULL) {
RT_UNLOCK(ro->ro_rt);
return;
}
==== //depot/projects/soc2008/snagg-audit/sys/security/audit/audit.h#2 (text) ====
@@ -26,7 +26,7 @@
* IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
* POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/security/audit/audit.h,v 1.15 2007/10/26 01:23:07 csjp Exp $
+ * $FreeBSD: src/sys/security/audit/audit.h,v 1.16 2008/04/24 12:23:31 rwatson Exp $
*/
/*
@@ -202,7 +202,7 @@
* possible that an audit record was begun before auditing was turned off.
*/
#define AUDIT_SYSCALL_EXIT(error, td) do { \
- if (audit_enabled | (td->td_ar != NULL)) \
+ if (audit_enabled || (td->td_ar != NULL)) \
audit_syscall_exit(error, td); \
} while (0)
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 20:59:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0B0A51065676; Thu, 24 Apr 2008 20:59:20 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C16F8106564A
for <perforce@freebsd.org>; Thu, 24 Apr 2008 20:59:19 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id C2FB38FC1A
for <perforce@freebsd.org>; Thu, 24 Apr 2008 20:59:19 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3OKxJaE033970
for <perforce@freebsd.org>; Thu, 24 Apr 2008 20:59:19 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3OKxJ2o033968
for perforce@freebsd.org; Thu, 24 Apr 2008 20:59:19 GMT
(envelope-from gabor@freebsd.org)
Date: Thu, 24 Apr 2008 20:59:19 GMT
Message-Id: <200804242059.m3OKxJ2o033968@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140548 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 20:59:20 -0000
http://perforce.freebsd.org/chv.cgi?CH=140548
Change 140548 by gabor@gabor_server on 2008/04/24 20:58:51
IFC
Affected files ...
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/Makefile#2 integrate
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/linux-users/Makefile#1 branch
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#1 branch
Differences ...
==== //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.11 2008/03/31 16:58:38 carvay Exp $
+# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.12 2008/04/24 19:11:13 carvay Exp $
# $FreeBSDes: doc/es_ES.ISO8859-1/articles/Makefile,v 1.3 2004/10/09 02:01:17 jesusr Exp $
SUBDIR =
@@ -12,6 +12,7 @@
SUBDIR+= fdp-es
SUBDIR+= laptop
SUBDIR+= linux-comparison
+SUBDIR+= linux-users
SUBDIR+= mailing-list-faq
SUBDIR+= nanobsd
SUBDIR+= p4-primer
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 22:24:19 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 684C41065679; Thu, 24 Apr 2008 22:24:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 29BC71065676
for <perforce@freebsd.org>; Thu, 24 Apr 2008 22:24:19 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 2A5E38FC16
for <perforce@freebsd.org>; Thu, 24 Apr 2008 22:24:19 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3OMOIaD041294
for <perforce@freebsd.org>; Thu, 24 Apr 2008 22:24:18 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3OMOIP9041292
for perforce@freebsd.org; Thu, 24 Apr 2008 22:24:18 GMT
(envelope-from gabor@freebsd.org)
Date: Thu, 24 Apr 2008 22:24:18 GMT
Message-Id: <200804242224.m3OMOIP9041292@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140559 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 22:24:19 -0000
http://perforce.freebsd.org/chv.cgi?CH=140559
Change 140559 by gabor@gabor_server on 2008/04/24 22:23:41
- Prepare the share subdirectory for the translation of the release
notes
Affected files ...
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/share/sgml/catalog#2 edit
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/share/sgml/release.dsl#2 edit
Differences ...
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/share/sgml/catalog#2 (text+ko) ====
@@ -1,9 +1,10 @@
-- FreeBSD SGML Public Identifiers --
-- Language-specific --
- -- $FreeBSD: src/release/doc/en_US.ISO8859-1/share/sgml/catalog,v 1.1 2001/07/09 16:01:35 bmah Exp $ --
+ -- $FreeBSD$ --
+
+ -- The FreeBSD Spanish Documentation Project --
+ -- Original Revision: r1.1 --
PUBLIC "-//FreeBSD//DOCUMENT Release Notes DocBook Stylesheet//EN"
"release.dsl"
-
-
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/share/sgml/release.dsl#2 (text+ko) ====
@@ -19,18 +19,18 @@
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
- (literal "This file, and other release-related documents, can be downloaded from ")
+ (literal "Puede descargar éste y otros documentos relacionados a la release desde ")
(create-link (list (list "HREF" (entity-text "release.url")))
(literal (entity-text "release.url")))
(literal ".")))
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
- (literal "For questions about FreeBSD, read the ")
+ (literal "Si tiene dudas sobre FreeBSD consulte la ")
(create-link
(list (list "HREF" "http://www.FreeBSD.org/docs.html"))
- (literal "documentation"))
- (literal " before contacting <")
+ (literal "documentación"))
+ (literal " antes de escribir a la lista <")
(create-link
(list (list "HREF" "mailto:questions@FreeBSD.org"))
(literal "questions@FreeBSD.org"))
@@ -38,18 +38,18 @@
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
- (literal "All users of FreeBSD ")
+ (literal "Cada usuario de FreeBSD ")
(literal (entity-text "release.branch"))
- (literal " should subscribe to the ")
+ (literal " debe suscribirse a la lista lista de distribución ")
(literal "<")
(create-link (list (list "HREF" "mailto:current@FreeBSD.org"))
(literal "current@FreeBSD.org"))
- (literal "> mailing list.")))
+ (literal ">.")))
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
- (literal "For questions about this documentation, e-mail <")
+ (literal "Envíe sus preguntas sobre la documentación a <")
(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))))
From owner-p4-projects@FreeBSD.ORG Thu Apr 24 22:24:20 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 379EC10656FF; Thu, 24 Apr 2008 22:24:19 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 4D01B1065677
for <perforce@freebsd.org>; Thu, 24 Apr 2008 22:24:19 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 4D00D8FC17
for <perforce@freebsd.org>; Thu, 24 Apr 2008 22:24:19 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3OMOJrv041299
for <perforce@freebsd.org>; Thu, 24 Apr 2008 22:24:19 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3OMOJkZ041297
for perforce@freebsd.org; Thu, 24 Apr 2008 22:24:19 GMT
(envelope-from gabor@freebsd.org)
Date: Thu, 24 Apr 2008 22:24:19 GMT
Message-Id: <200804242224.m3OMOJkZ041297@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140560 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 24 Apr 2008 22:24:20 -0000
http://perforce.freebsd.org/chv.cgi?CH=140560
Change 140560 by gabor@gabor_server on 2008/04/24 22:24:18
- Initial translation of the errata document
Affected files ...
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/Makefile#2 edit
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/article.sgml#2 edit
Differences ...
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/Makefile#2 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/errata/Makefile,v 1.5 2001/09/03 14:39:31 dd Exp $
+# $FreeBSD$
RELN_ROOT?= ${.CURDIR}/../..
.ifdef NO_LANGCODE_IN_DESTDIR
DESTDIR?= ${DOCDIR}/errata
.else
-DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/errata
+DESTDIR?= ${DOCDIR}/es_ES.ISO8859-1/errata
.endif
DOC?= article
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/article.sgml#2 (text+ko) ====
@@ -10,8 +10,11 @@
-->
+<!-- The FreeBSD Spanish Documentation Project
+ Original Revision: r1.73 -->
+
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//ES">
%articles.ent;
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
@@ -34,10 +37,10 @@
Errata</title>
<corpauthor>
- The &os; Project
+ El Proyecto &os;
</corpauthor>
- <pubdate>$FreeBSD: src/release/doc/en_US.ISO8859-1/errata/article.sgml,v 1.73 2005/04/19 09:42:25 hrs Exp $</pubdate>
+ <pubdate>$FreeBSD$</pubdate>
<copyright>
<year>2000</year>
@@ -46,7 +49,9 @@
<year>2003</year>
<year>2004</year>
<year>2005</year>
+ <year>2008</year>
<holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
+ <holder role="mailto:doc@FreeBSD.org">The &os; Spanish Documentation Project</holder>
</copyright>
<legalnotice id="trademarks" role="trademarks">
@@ -58,7 +63,7 @@
</articleinfo>
<abstract>
- <para>This document lists errata items for &os;
+ <para>Este documento enumera elementos de errata acerca de &os;
<![ %release.type.current [
&release.current;,
]]>
@@ -68,16 +73,16 @@
<![ %release.type.release [
&release.current;,
]]>
- containing significant information discovered after the release
- or too late in the release cycle to be otherwise included in the
- release documentation.
- This information includes security advisories, as well as news
- relating to the software or documentation that could affect its
- operation or usability. An up-to-date version of this document
- should always be consulted before installing this version of
- &os;.</para>
+ teniendo información significativa descubierta después
+ de la release o en una fase demasiado tarde del proceso de la release
+ para incluir en la documentación de ella.
+ Estas informaciones incluyen no solamente avisos de seguridad sino
+ también noticias relacionadas al software o a la
+ documentación que afectará su funcionamiento o uso.
+ Debe consultar la versión actual de este documento antes
+ de instalar esta versión de &os;.</para>
- <para>This errata document for &os;
+ <para>Este documento de errata para &os;
<![ %release.type.current [
&release.current;
]]>
@@ -87,14 +92,14 @@
<![ %release.type.release [
&release.current;
]]>
- will be maintained until the release of &os; &release.next;.</para>
+ se mantandrá hasta la release &release.next; de &os;.</para>
</abstract>
<sect1 id="intro">
- <title>Introduction</title>
+ <title>Introducción</title>
- <para>This errata document contains <quote>late-breaking news</quote>
- about &os;
+ <para>Este documento de errata tiene <quote>noticias tardes</quote>
+ acerca de &os;
<![ %release.type.current [
&release.current;.
]]>
@@ -104,76 +109,77 @@
<![ %release.type.release [
&release.current;.
]]>
- Before installing this version, it is important to consult this
- document to learn about any post-release discoveries or problems
- that may already have been found and fixed.</para>
+ Antes de instalar esta versión, es importante que consulte
+ este documento para enterarse de los problemas que se han descubiertos
+ después de la release, pero se han encontrado y solucionado
+ ya.</para>
- <para>Any version of this errata document actually distributed
- with the release (for example, on a CDROM distribution) will be
- out of date by definition, but other copies are kept updated on
- the Internet and should be consulted as the <quote>current
- errata</quote> for this release. These other copies of the
- errata are located at <ulink
- url="http://www.FreeBSD.org/releases/"></ulink>, plus any sites
- which keep up-to-date mirrors of this location.</para>
+ <para>Cualquier versión de este documento que se distribuye
+ con la release (p.ej. en un CD-ROM) estará desactualizada
+ por definición, pero las copias en línea se
+ mantendrán actualizadas en el Internet como el
+ <quote>errata actual</quote> para colsultar sobre esta release.
+ Éstas se encuentran en <ulink
+ url="http://www.FreeBSD.org/releases/"></ulink> más en
+ cualquier sitio que mantenga un espejo actualizado de esta
+ locación.</para>
- <para>Source and binary snapshots of &os; &release.branch; also
- contain up-to-date copies of this document (as of the time of
- the snapshot).</para>
+ <para>Instantáneas binárias o de fuente de la
+ bifurcación &release.branch; de &os; también
+ tienen una copia actualizada de este documento (al tiempo
+ de la instantánea).</para>
- <para>For a list of all &os; CERT security advisories, see <ulink
+ <para>Consulte la lista de todos los avisos CERT de seguridad
+ de &os; aquí: <ulink
url="http://www.FreeBSD.org/security/"></ulink> or <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink>.</para>
-
</sect1>
<sect1 id="security">
- <title>Security Advisories</title>
+ <title>Avisos de seguridad</title>
<![ %release.type.release [
- <para>No advisories.</para>
+ <para>No hay avisos.</para>
]]>
<![ %release.type.current [
- <para>No advisories.</para>
+ <para>No hay avisos.</para>
]]>
<![ %release.type.snapshot [
- <para>No advisories.</para>
+ <para>No hay avisos.</para>
]]>
-
</sect1>
<sect1 id="open-issues">
- <title>Open Issues</title>
+ <title>Tareas Pendientes</title>
<![ %release.type.current [
- <para>No open issues.</para>
+ <para>No hay tareas pendientes.</para>
]]>
<![ %release.type.release [
- <para>No open issues.</para>
+ <para>No hay tareas pendientes.</para>
]]>
<![ %release.type.snapshot [
- <para>No open issues.</para>
+ <para>No hay tareas pendientes.</para>
]]>
-
</sect1>
<sect1 id="late-news">
- <title>Late-Breaking News</title>
+ <title>Noticias tardes</title>
<![ %release.type.current [
- <para>No news.</para>
+ <para>No hay noticias.</para>
]]>
<![ %release.type.release [
- <para>No news.</para>
+ <para>No hay noticias.</para>
]]>
<![ %release.type.snapshot [
- <para>No news.</para>
+ <para>No hay noticias.</para>
]]>
</sect1>
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 04:29:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 7ACCC106567C; Fri, 25 Apr 2008 04:29:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 20A741065676
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 04:29:53 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 0B1558FC15
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 04:29:53 +0000 (UTC)
(envelope-from pgj@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3P4TqGK073437
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 04:29:52 GMT
(envelope-from pgj@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3P4Tq2l073435
for perforce@freebsd.org; Fri, 25 Apr 2008 04:29:52 GMT
(envelope-from pgj@FreeBSD.org)
Date: Fri, 25 Apr 2008 04:29:52 GMT
Message-Id: <200804250429.m3P4Tq2l073435@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pgj@FreeBSD.org using -f
From: Gabor Pali <pgj@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140572 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 04:29:53 -0000
http://perforce.freebsd.org/chv.cgi?CH=140572
Change 140572 by pgj@disznohal on 2008/04/25 04:29:12
Cleanup in Chapter 6.
Affected files ...
.. //depot/projects/docproj_hu/books/handbook/desktop/chapter.sgml#5 edit
Differences ...
==== //depot/projects/docproj_hu/books/handbook/desktop/chapter.sgml#5 (text+ko) ====
@@ -23,11 +23,11 @@
<sect1 id="desktop-synopsis">
<title>Áttekintés</title>
- <para>&os;-n asztali alkalmazások széles
+ <para>A &os;-n asztali alkalmazások széles
spektrumát lehet futtatni, például
böngészõket és
szövegszerkesztõket. Legtöbbjük
- csomagként áll rendelkezésre, ill.
+ csomagként áll rendelkezésre, illetve
automatizált módon lefordíthatóak a
Portgyûjteménybõl. Az új
felhasználók közül sokan
@@ -40,14 +40,13 @@
a Portgyûjteményben megtalálható
formájukról.</para>
- <para>Vegyük figyelembe, hogy amikor portként
- telepítünk egy programot, a
- forráskódját fordítjuk le. Ez
- bizonyos esetekben nagyon sokáig is eltarthat attól
- függõen, hogy pontosan mit is fordítunk le ill.
- mekkora az erre a célra felhasznált
- számítógépünk,
- számítógépeink
+ <para>Amikor portként telepítünk egy programot,
+ lényegében a forráskódját
+ fordítjuk le. Ez bizonyos esetekben nagyon sokáig
+ is eltarthat attól függõen, hogy pontosan mit is
+ fordítunk le, illetve mekkora az erre a célra
+ felhasznált számítógépünk
+ vagy számítógépeink
teljesítménye. Amennyiben a
fordításra nem tudunk vagy nem
kívánunk elegendõ idõt szánni, a
@@ -56,23 +55,22 @@
lefordított csomagból is
telepíthetjük.</para>
- <para>Mivel a &os; rendelkezik Linux kompatibilitással,
- számos, eredetileg &linux;-ra fejlesztett alkalmazás
- is elérhetõvé válik az asztali
- környezetünkön történõ
- használatra. Azonban határozottan javasoljuk, hogy
- a &linux;-os alkalmazások használatához
- elõször figyelmesen olvassa át a <xref
- linkend="linuxemu">et. A &linux;-os bináris
- kompabilitást használó portok neve
- általában a <quote>linux-</quote> elõtaggal
- kezdõdik. Ezt ne felejtsük el figyelembe venni, amikor
- pl. a &man.whereis.1; segítségével
- keresünk egy portot. A fejezet további
- részében feltételezzük, hogy
- aktiváltuk a bináris &linux;-kompatibilitást
- a &linux;-os alkalmazások telepítése
- elõtt.</para>
+ <para>Mivel a &os;-ben bináris szintû Linux
+ kompatibilitás is található, ezért az
+ eredetileg Linuxra fejlesztett alkalmazások is
+ használhatóak a munkakörnyezetünkben.
+ Azonban határozottan javasoljuk, hogy a Linuxos
+ alkalmazások használatához elõször
+ figyelmesen olvassuk át a <xref linkend="linuxemu">et. A
+ Linuxos bináris kompabilitást használó
+ portok neve általában a <quote>linux-</quote>
+ elõtaggal kezdõdik, amit ne felejtsük el figyelembe
+ venni, amikor például a &man.whereis.1;
+ segítségével keressük valamelyiket. A
+ fejezet további részében
+ feltételezzük, hogy a Linuxos alkalmazások
+ telepítése elõtt aktiváltuk a
+ bináris Linux kompatibilitást.</para>
<para>Íme a fejezetben tárgyalt
kategóriák:</para>
@@ -114,25 +112,26 @@
<itemizedlist>
<listitem>
- <para>A külsõ alkalmazások
+ <para>a külsõ alkalmazások
telepítésének ismerete (<xref
- linkend="ports">).</para>
+ linkend="ports">);</para>
</listitem>
<listitem>
- <para>&linux;-os alkalmazások
+ <para>Linuxos alkalmazások
telepítésének ismerete (<xref
linkend="linuxemu">).</para>
</listitem>
</itemizedlist>
- <para>A multimédiás környezet
+ <para>a multimédiás környezet
kialakítására vonatkozó
információkért a <xref linkend="multimedia">t
érdemes elolvasni. Az elektronikus levelezés
beállítását és
használatát a <xref linkend="mail">bõl
tudhatjuk meg.</para>
+
</sect1>
<sect1 id="desktop-browsers">
@@ -149,15 +148,15 @@
url="http://www.FreeBSD.org/ports/www.html">www</ulink>
könyvtárat, ahol ezzel szemben rengeteg
böngészõ áll telepítésre
- készen. Csomagolt formában is
- elérhetõek, ha nem lenne idõnk mindent
- lefordítani (ami egyes esetekben akár rengeteg
- idõnkbe is kerülhet).</para>
+ készen. Ha nem lenne idõnk mindent lefordítani
+ (ami egyes esetekben akár rengeteg idõnkbe is
+ kerülhet), ezek csomagolt formában is
+ elérhetõek.</para>
<para>A <application>KDE</application>-hez és a
<application>GNOME</application>-hoz eleve tartoznak
HTML-böngészõk. Ezen komplett
- asztalkörnyezetek beállításához a
+ munkakörnyezetek beállításához a
<xref linkend="x11-wm">t olvassuk el.</para>
<para>Ha viszont csak egy kevés erõforrást
@@ -177,7 +176,8 @@
<row>
<entry>Alkalmazás</entry>
<entry>Erõforrásigény</entry>
- <entry>Telepítés forrásból</entry>
+ <entry>Telepítés
+ forrásból</entry>
<entry>Fõbb függõségek</entry>
</row>
</thead>
@@ -194,11 +194,11 @@
<entry><application>Opera</application></entry>
<entry>kevés</entry>
<entry>könnyû</entry>
- <entry>Vannak &os;-s és &linux;-os változatai
- is. A &linux;-os verzió használatához
- azonban szükség van a bináris
- &linux;-kompatibilitásra és a
- <application>linux-openmotif</application>-ra.</entry>
+ <entry>Vannak &os;-s és Linuxos változatai is.
+ A Linuxos verzió használatához
+ azonban szükség van a bináris Linux
+ kompatibilitásra és a
+ <application>linux-openmotif</application> portra.</entry>
</row>
<row>
@@ -212,8 +212,8 @@
<entry><application>Konqueror</application></entry>
<entry>közepes</entry>
<entry>nehéz</entry>
- <entry>a <application>KDE</application>
- függvénykönyvtárai</entry>
+ <entry>A <application>KDE</application>
+ függvénykönyvtárai.</entry>
</row>
</tbody>
</tgroup>
@@ -221,16 +221,15 @@
<sect2>
<title>Mozilla</title>
- <indexterm>
- <primary><application>Mozilla</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>Mozilla</application></primary></indexterm>
<para>A <application>Mozilla</application> egy modern,
- megbízható böngészõ, melyet
- sikeresen portoltak &os;-re. Egy nagyon jó, a
+ megbízható böngészõ, amelyet
+ sikeresen portoltak &os;-re. Ez egy nagyon jó, a
szabványoknak megfelelõ HTML-megjelenítõ
motorral rendelkezik, valamint hírolvasót
- és levelezõklienst is tartalmaz. Ezenfelül
+ és levelezõ klienst is tartalmaz. Ezenfelül
találhatunk benne egy HTML-szerkesztõt is, ami
jól használható honlapok
készítéséhez. A
@@ -238,29 +237,29 @@
felhasználók felfedezhetnek némi
hasonlóságot a
<application>Communicator</application> programcsomaggal, mivel
- ez a két böngészõ valaha ugyanaz
- volt.</para>
+ ez a két böngészõ valaha egy és
+ ugyanaz volt.</para>
<para>233 MHz-nél lassabb processzorral vagy 64
MB-nál kevesebb memóriával rendelkezõ
- gépeken a <application>Mozilla</application>
- erõforrásigényesnek hathat a megfelelõ
- használathoz. Ebben az esetben inkább
- érdemes a fejezet egy késõbbi
- részében bemutatandó
- <application>Opera</application> böngészõ
- használata.</para>
+ gépeken a kielégítõ
+ mûködéshez a <application>Mozilla</application>
+ erõforrásigényesnek tûnhet. Ebben az
+ esetben inkább érdemes a fejezet egy
+ késõbbi részében bemutatandó
+ <application>Opera</application> böngészõt
+ használni.</para>
<para>Ha bármilyen okból nem akarjuk vagy nem tudjuk
- lefordítani a <application>Mozilla</application>-t,
+ lefordítani a <application>Mozilla</application>t,
nyugodtan támaszkodhatunk a &os; GNOME csapatának
munkájára. Hálózaton keresztül
- a következõ paranccsal tudjuk telepíteni
- csomagból:</para>
+ csomagból a következõ paranccsal tudjuk
+ telepíteni:</para>
<screen>&prompt.root; <userinput>pkg_add -r mozilla</userinput></screen>
- <para>Ha ez a csomag nem érhetõ el, és van
+ <para>Ha ez a csomag nem érhetõ el, de van
elegendõ idõnk és tárhelyünk,
letölthetjük a <application>Mozilla</application>
forrását is, amit aztán lefordítunk
@@ -275,12 +274,13 @@
beállítások
érvényesítésével gondoskodik
a megfelelõ inicializálásról. Azonban
- ha további kiegészítéseket
- szeretnénk még telepíteni, mondjuk az
- egérmozdulatok támogatását,
- magunknak kell <username>root</username>-ként futtatni a
- <application>Mozilla</application>-t, hogy szabályosan
- feltelepítõdhessenek.</para>
+ ha további kiegészítéseket is
+ szeretnénk még telepíteni,
+ például az egérmozdulatok
+ támogatását, magunknak kell
+ <username>root</username> felhasználóként
+ futtatni a <application>Mozilla</application>t, hogy ezek
+ szabályosan telepítõdhessenek.</para>
<para>Amint sikeresen befejezõdõtt a
<application>Mozilla</application> telepítése,
@@ -292,25 +292,25 @@
<screen>&prompt.user; <userinput>mozilla</userinput></screen>
- <para>Hírolvasóként és
- levelezõkliensként pedig az alábbi módon
- lehet elindítani:</para>
+ <para>Hírolvasóként és levelezõ
+ kliensként pedig az alábbi módon lehet
+ elindítani:</para>
<screen>&prompt.user; <userinput>mozilla -mail</userinput></screen>
+
</sect2>
<sect2>
<title>Firefox</title>
- <indexterm>
- <primary><application>Firefox</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>Firefox</application></primary></indexterm>
<para>A <application>Firefox</application> a
<application>Mozilla</application> alapjaira
építkezõ, következõ
generációs böngészõ. A
<application>Mozilla</application> egy teljes programcsomag,
- tehát böngészõ, levelezõkliens,
+ tehát böngészõ, levelezõ kliens,
csevegõkliens stb. A <application>Firefox</application>
azonban csak egy egyszerû böngészõ, aminek
köszönhetõen kisebb és gyorsabb is.</para>
@@ -325,6 +325,7 @@
<screen>&prompt.root; <userinput>cd /usr/ports/www/firefox</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
+
</sect2>
<sect2 id="moz-java-plugin">
@@ -332,21 +333,21 @@
<note>
<para>Ennél és a következõ
- résznél feltételezzük, hogy már
- korábban telepítettük a
+ résznél feltételezzük, hogy
+ már korábban telepítettük a
<application>Firefox</application> vagy a
<application>Mozilla</application> alkalmazások
valamelyikét.</para>
</note>
- <para>A &os; alapítvány megegyezett a Sun
+ <para>A &os; Alapítvány megegyezett a Sun
Microsystems-szel, hogy terjesztheti a &java;
futtatókörnyezet (&jre;) és a &java;
fejlesztõkörnyezet (&jdk;) &os;-re lefordított
bináris változatait. Ezek a csomagok
elérhetõek a <ulink
url="http://www.freebsdfoundation.org/downloads/java.shtml">&os;
- alapítvány</ulink>
+ Alapítvány</ulink>
honlapjáról.</para>
<para>Ha tehát &java;-támogatást
@@ -364,19 +365,20 @@
<para>Indítsuk el a böngészõnket,
és írjuk be a címsorba, hogy
<literal>about:plugins</literal> és nyomjuk le az
- <keycap>Enter</keycap>t. Az eredményül kapott
- oldalon láthatjuk az eddig telepített pluginok
- listáját, ahol mostanra már a
- <application>&java;</application> pluginnak is meg kell
- jelennie. Amennyiben ez nem következne be,
- <username>root</username>ként adjuk ki az alábbi
- parancsot:</para>
+ <keycap>Enter</keycap> billentyût. Az
+ eredményül kapott oldalon láthatjuk az eddig
+ telepített pluginok listáját, ahol mostanra
+ már a <application>&java;</application> pluginnak is meg
+ kell jelennie. Amennyiben ez nem következne be,
+ <username>root</username> felhasználóként
+ adjuk ki az alábbi parancsot:</para>
<screen>&prompt.root; <userinput>ln -s /usr/local/diablo-jre1.5.0/plugin/i386/ns7/libjavaplugin_oji.so \
/usr/local/lib/browser_plugins/</userinput></screen>
- <para>és indítsuk újra a
+ <para>Ezt követõen indítsuk újra a
böngészõnket.</para>
+
</sect2>
<sect2 id="moz-flash-plugin">
@@ -386,11 +388,11 @@
<para>A ¯omedia; &flash; plugin nem érhetõ el
közvetlenül &os;-re. Azonban létezik egy, a
- plugin &linux;-os verziójára épített
+ plugin Linuxos verziójára épített
szoftveres réteg (wrapper). Ez a wrapper még
- használhatóvá teszi többek közt
- az &adobe; &acrobat; és a &realplayer; pluginjait
- is.</para>
+ többek közt az &adobe; &acrobat; és a
+ &realplayer; pluginjait is használhatóvá
+ teszi.</para>
<para>Telepítsük fel a <filename
role="package">www/linuxpluginwrapper</filename> portot. A port
@@ -411,16 +413,16 @@
Miután felkerült a plugin, indítsuk el a
böngészõt és írjuk be az
<literal>about:plugins</literal> sort a címsorba, majd
- üssünk <keycap>Enter</keycap>t. Az eddig
+ nyomjuk le az <keycap>Enter</keycap> billentyût. Az eddig
telepített pluginok felsorolása fog
megjelenni.</para>
<para>Ha nem szerepel közte a &flash; plugin, akkor annak az
- oka (legalább is az esetek többségében)
- egy hiányzó szimbolikus link. A
- pótlásához
- <username>root</username>ként adjuk ki a
- következõ parancsokat:</para>
+ oka (legalább is az esetek
+ többségében) egy hiányzó
+ szimbolikus link. A pótlásához
+ <username>root</username> felhasználóként
+ adjuk ki a következõ parancsokat:</para>
<screen>&prompt.root; <userinput>ln -s /usr/local/lib/npapi/linux-flashplugin/libflashplayer.so \
/usr/local/lib/browser_plugins/</userinput>
@@ -440,22 +442,21 @@
<sect2>
<title>Opera</title>
- <indexterm>
- <primary><application>Opera</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>Opera</application></primary></indexterm>
<para>Az <application>Opera</application> egy sokoldalú
és szabványokkal kompatibilis
böngészõ. Tartalmaz beépített
- levelezõklienst és hírolvasót,
+ levelezõ klienst és hírolvasót,
IRC-klienst, RSS/Atom-olvasót és még sok
mindent mást. Ennek ellenére az
<application>Opera</application> viszonylag
- pehelysúlyúnak és gyorsanak
+ pehelysúlyúnak és gyorsnak
számít. Két fajta módon is
használható: létezik
<quote>natív</quote> &os;-s változata, valamint a
- &linux; emulációval futó
+ Linux emulációval futó
változata.</para>
<para>Az <application>Opera</application> &os;-s
@@ -468,37 +469,36 @@
<para>Habár egyes FTP oldalakon nem található
meg az összes csomag, viszont a
Portgyûjteménybõl még ekkor is be tudjuk
- szerezni az <application>Opera</application>-t:</para>
+ szerezni az <application>Opera</application>t:</para>
<screen>&prompt.root; <userinput>cd /usr/ports/www/opera</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
- <para>A &linux;-os <application>Opera</application>
+ <para>A Linuxos <application>Opera</application>
telepítéséhez <literal>opera</literal>
- helyett <literal>linux-opera</literal>-t kell megadnunk a fenti
- parancsokban. Ennek a verziónak a használata
- akkor lehet elõnyös, ha olyan plugineket akarunk
- elérni, amelyek csak &linux;-ra léteznek. Ilyen
- példáu az <application>Adobe
- &acrobat.reader;</application>. Ettõl eltekintve azonban a
- &os;-s és &linux;-os változatok szinte teljesen
- megegyeznek.</para>
+ helyett <literal>linux-opera</literal> nevet kell megadnunk a
+ fenti parancsokban. Ennek a verziónak a
+ használata akkor lehet elõnyös, ha olyan
+ plugineket akarunk elérni, amelyek csak Linuxra
+ léteznek. Ilyen például az
+ <application>Adobe &acrobat.reader;</application>. Ettõl
+ eltekintve azonban a &os;-s és a Linuxos
+ változatok szinte teljesen megegyeznek.</para>
</sect2>
<sect2>
<title>Konqueror</title>
- <indexterm>
- <primary><application>Konqueror</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>Konqueror</application></primary></indexterm>
<para>A <application>Konqueror</application> a
- <application>KDE</application> része, de
- anélkül is használható, ha csak a
- <filename role="package">x11/kdebase3</filename> portot
+ <application>KDE</application> része, de a
+ használatához elegendõ, ha csak a <filename
+ role="package">x11/kdebase3</filename> portot
telepítjük fel. A
<application>Konqueror</application> több, mint egy
- egszerû böngészõ:
+ egyszerû böngészõ:
állománykezelõ és
multimédiás nézegetõ is.</para>
@@ -508,12 +508,13 @@
találunk meg.</para>
<para>A <application>Konqueror</application> ismeri a
- <application>&flash;</application>-t is. A
+ <application>&flash;</application>t is. A
<application>&flash;</application> és a
<application>Konqueror</application> kapcsolatával egy
külön <quote>Hogyan</quote> is foglalkozik, amelyet a
<ulink url="http://freebsd.kde.org/howto.php"></ulink>
címen olvashatunk el.</para>
+
</sect2>
</sect1>
@@ -523,13 +524,14 @@
<para>Amikor irodai felhasználásról van
szó, az új felhasználók gyakorta
keresnek egy jó irodai programcsomagot vagy egy
- baratságos szövegszerkesztõt. Habár az
- egyes <link linkend="x11-wm">asztalkörnyezetek</link>, mint
- mondjuk a <application>KDE</application>, gyakran saját
- irodai eszközöket is tartalmaznak, &os; alatt nincs
- alapértelmezett irodai programcsomag. A rendszer az
- asztalkörnyezetektõl függetlenül igyekszik
- felkínálni mindazt, amire
+ barátságos szövegszerkesztõt.
+ Habár az egyes <link
+ linkend="x11-wm">munkakörnyezetek</link>, mint
+ például a <application>KDE</application>, gyakran
+ saját irodai eszközöket is tartalmaznak, &os;
+ alatt nincs alapértelmezett irodai programcsomag. A
+ rendszer a munkakörnyezetektõl függetlenül
+ igyekszik felkínálni mindazt, amire
szükségünk lehet.</para>
<para>Ebben a részben a következõ
@@ -541,7 +543,8 @@
<row>
<entry>Alkalmazás</entry>
<entry>Erõforrásigény</entry>
- <entry>Telepítés forrásból</entry>
+ <entry>Telepítés
+ forrásból</entry>
<entry>Fõbb függõségek</entry>
</row>
</thead>
@@ -582,17 +585,16 @@
<sect2>
<title>KOffice</title>
- <indexterm>
- <primary><application>KOffice</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>KOffice</application></primary></indexterm>
<indexterm>
<primary>irodai programcsomag</primary>
<secondary><application>KOffice</application></secondary>
</indexterm>
<para>A KDE közösség által kiadott
- asztalkörnyezethez társul egy irodai programcsomag is,
- amely a <application>KDE</application>-tõl
+ munkakörnyezethez társul egy irodai programcsomag
+ is, amely a <application>KDE</application>-tõl
függetlenül is használható. Tartalmazza
a többi irodai programcsomagban is
megtalálható négy szabványos
@@ -602,34 +604,35 @@
a <application>KPresenter</application>
prezentációkészítõt és
végezetül a <application>Kontour</application>t,
- mellyel grafikus dokumentumokat tudunk rajzolni.</para>
+ mellyel grafikus dokumentumokat tudunk
+ elkészíteni.</para>
<para>A legfrissebb <application>KOffice</application>
telepítése elõtt bizonyosodjuk meg
róla, hogy a <application>KDE</application> legfrissebb
verziójával is rendelkezünk.</para>
- <para>A <application>KOffice</application> csomagként
- történõ telepítéséhez adjuk
- ki az alábbi parancsot:</para>
+ <para>Ha a <application>KOffice</application>-t csomagként
+ akarjuk telepíteni, akkor adjuk ki az alábbi
+ parancsot:</para>
<screen>&prompt.root; <userinput>pkg_add -r koffice</userinput></screen>
- <para>Ha ez a csomag nem érhetõ el,
- telepíthetjük a Portgyûjteménybõl is.
- Például a <application>KDE3</application>-hoz
+ <para>Amennyiben ez a csomag nem érhetõ el,
+ telepíthetjük a Portgyûjteménybõl
+ is. Például a <application>KDE3</application>-hoz
tartozó <application>KOffice</application>-t így
rakhatjuk fel:</para>
<screen>&prompt.root; <userinput>cd /usr/ports/editors/koffice-kde3</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
+
</sect2>
<sect2>
<title>AbiWord</title>
- <indexterm>
- <primary><application>AbiWord</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>AbiWord</application></primary></indexterm>
<para>Az <application>AbiWord</application> egy szabad
szövegszerkesztõ program, a <application>µsoft;
@@ -644,34 +647,35 @@
többféle állományformátumba
exportálni és onnan importálni,
beleértve az olyan zárt formátumokat is,
- mint mondjuk a µsoft; <filename>.doc</filename>.</para>
+ mint például a µsoft;
+ <filename>.doc</filename>.</para>
<para>Az <application>AbiWord</application> csomagból
- telepíthetõ, a következõ
+ telepíthetõ a következõ
módon:</para>
<screen>&prompt.root; <userinput>pkg_add -r abiword</userinput></screen>
<para>Amennyiben ez a csomag nem érhetõ el,
lefordítható a Portgyûjteménybõl
- is, ill. a Portgyûjtemény sokszor frissebb
+ is, ami ráadásul sokszor egy frissebb
verziót tartalmaz. Ezt így tudjuk
megtenni:</para>
<screen>&prompt.root; <userinput>cd /usr/ports/editors/abiword</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
+
</sect2>
<sect2>
<title>The GIMP</title>
- <indexterm>
- <primary><application>The GIMP</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>The GIMP</application></primary></indexterm>
<para>Képek készítésére vagy
- retusálásra a <application>The GIMP</application> a
- legfejlettebb képszerkesztõ program. Egyszerû
- rajzolóprogram gyanánt is
+ retusálásra a <application>The GIMP</application>
+ a legfejlettebb képszerkesztõ program.
+ Egyszerû rajzolóprogram gyanánt is
használható, de akár minõségi
fényképretusálásra is.
Óriási mennyiségû plugin
@@ -696,7 +700,7 @@
könyvtárában ezen felül
fellelhetjük a <application>The Gimp Manual</application>t,
vagyis a <application>The GIMP</application>
- kézikönyvét. Innen így kell õket
+ kézikönyvét. Így kell ezeket innen
telepíteni:</para>
<screen>&prompt.root; <userinput>cd /usr/ports/graphics/gimp</userinput>
@@ -716,13 +720,13 @@
role="package">graphics/gimp-manual-html</filename>
alkönyvtárban található.</para>
</note>
+
</sect2>
<sect2>
<title>OpenOffice.org</title>
- <indexterm>
- <primary><application>OpenOffice.org</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>OpenOffice.org</application></primary></indexterm>
<indexterm>
<primary>irodai programcsomag</primary>
<secondary><application>OpenOffice.org</application></secondary>
@@ -754,10 +758,10 @@
összekapcsolható külsõ
adatbázisokkal. Az
<application>OpenOffice.org</application> natívan
- és megbízhatóan fut &windows;-on,
- &solaris;-on, &linux;-on, &os;-n és &macos; X-en.
- Az <application>OpenOffice.org</application>-ról
- bõvebb információt a <ulink
+ és megbízhatóan fut &windows;on,
+ &solaris;on, &linux;on, &os;-n és &macos; X-en. Az
+ <application>OpenOffice.org</application>-ról bõvebb
+ információt a <ulink
url="http://www.openoffice.org/">projekt saját
honlapján</ulink> találhatunk. A &os;-s
változatra vonatkozó információkat
@@ -777,16 +781,17 @@
esetben érdemes egy pillantást vetni a &os;
<application>OpenOffice.org</application> Porting Team
honlapjára, ahonnan le tudjuk tölteni a
- verziókhoz megfelelõ csomagot, ami ezután a
- &man.pkg.add.1;-al fel tudunk telepíteni. A
- legfrissebb megbízható és fejlesztõi
- változat egyaránt elérhetõ
- errõl a helyrõl.</para>
+ verziókhoz megfelelõ csomagot, amelyet
+ ezután a &man.pkg.add.1;-al fel is tudunk
+ telepíteni. A legfrissebb megbízható
+ és fejlesztõi változat egyaránt
+ elérhetõ errõl a helyrõl.</para>
</note>
<para>Ahogy sikerült feltelepíteni a csomagot,
- egyszerûen csak be kell gépelni a következõ
- parancsot az <application>OpenOffice.org</application>
+ egyszerûen csak be kell gépelni a
+ következõ parancsot az
+ <application>OpenOffice.org</application>
futtatásához:</para>
<screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
@@ -797,24 +802,24 @@
további kérdésre is, valamint a
felhasználói könyvtárunkban
keletkezik egy <filename>.openoffice.org2</filename>
- könyvtár is.</para>
+ könyvtár.</para>
</note>
<para>Ha nem érhetõek el
<application>OpenOffice.org</application> csomagok,
lefordíthatjuk a forrását is. Azonban
- még mielõtt nekilátnánk, el kell
- fogadnunk, hogy ez a mûvelet rettenetesen sok
- területet fog igényelni a lemezünkön
- és meglehetõsen sokáig tart.</para>
+ mielõtt még ennek nekilátnánk, el kell
+ fogadnunk, hogy ez a mûvelet a lemezünkön
+ rettenetesen sok területet fog igényelni és
+ meglehetõsen sokáig tart.</para>
<screen>&prompt.root; <userinput>cd /usr/ports/editors/openoffice.org-2</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
<note>
<para>Ha egy honosított verziót szeretnénk
- fordítani, az utolsó parancs helyett írjuk
- inkább ezt:</para>
+ fordítani, az utolsó parancs helyett
+ írjuk inkább ezt:</para>
<screen>&prompt.root; <userinput>make LOCALIZED_LANG=<replaceable>nyelv</replaceable> install clean</userinput></screen>
@@ -832,6 +837,7 @@
indítható el parancssorból:</para>
<screen>&prompt.user; <userinput>openoffice.org</userinput></screen>
+
</sect2>
</sect1>
@@ -865,7 +871,7 @@
<entry><application>&acrobat.reader;</application></entry>
<entry>kevés</entry>
<entry>könnyû</entry>
- <entry>Bináris &linux;-kompatibilitás</entry>
+ <entry>Bináris Linux kompatibilitás</entry>
</row>
<row>
@@ -910,27 +916,26 @@
állományok megnézésére az
egyik legalkalmasabb alkalmazás az
<application>&acrobat.reader;</application>, melyet az Adobe
- adott ki &linux;-ra. De mivel a &os; képes &linux;
- binárisok futtatására, így &os;-re
- is elérhetõ.</para>
+ adott ki Linuxra. De mivel a &os; képes Linux
+ binárisok futtatására, ezért
+ így &os;-re is elérhetõ.</para>
- <para>Az <application>&acrobat.reader; 7</application>
- Portgyûjteménybõl történõ
- telepítéséhez írjuk be:</para>
+ <para>Ha az <application>&acrobat.reader; 7</application>-et a
+ Portgyûjteménybõl akarjuk telepíteni,
+ akkor írjuk be:</para>
<screen>&prompt.root; <userinput>cd /usr/ports/print/acroread7</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
- <para>Licenszelési megszorítások miatt a
- csomag nem áll rendelkezésre.</para>
+ <para>Licencelési megszorítások miatt csomag
+ nem áll rendelkezésre.</para>
</sect2>
<sect2>
<title>gv</title>
- <indexterm>
- <primary><application>gv</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>gv</application></primary></indexterm>
<indexterm>
<primary>PDF</primary>
<secondary>megjelenítõ</secondary>
@@ -945,7 +950,7 @@
<application>ghostview</application> alapján
készült, de a <application>Xaw3d</application>-nek
köszönhetõen sokkal szebben néz ki. Gyors
- és az interfésze letisztult. A
+ és az felülete letisztult. A
<application>gv</application> sok mindent tud, többek
közt beállítható benne a dokumentum
tájolása, a papírméret,
@@ -955,8 +960,8 @@
billentyûzetrõl vagy egérrel.</para>
<para>A <application>gv</application> csomagjának
- telepítéséhez a következõ parancsot
- használhatjuk:</para>
+ telepítéséhez a következõ
+ parancsot használhatjuk:</para>
<screen>&prompt.root; <userinput>pkg_add -r gv</userinput></screen>
@@ -965,29 +970,26 @@
<screen>&prompt.root; <userinput>cd /usr/ports/print/gv</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
+
</sect2>
<sect2>
<title>Xpdf</title>
+
+ <indexterm><primary><application>Xpdf</application></primary></indexterm>
<indexterm>
- <primary><application>Xpdf</application></primary>
- </indexterm>
- <indexterm>
<primary>PDF</primary>
<secondary>megjelenítõ</secondary>
</indexterm>
<para>Ha egy egyszerû &os;-s PDF megjelenítõre
- lenne szükségünk, az
- <application>Xpdf</application> pontosan egy ilyen kis
- erõforrás-igényû és
- hatékony eszköz. Nagyon kevés
- erõforrást igényel és nagyon
- megbízható. A szabványos X-beli
+ lenne szükségünk, erre a célra az
+ <application>Xpdf</application> pontosan megfelel. Nagyon
+ kevés erõforrást igényel és
+ nagyon megbízható. A szabványos X-beli
betûtípusokat használja, és nincs
- szüksége sem a
- <application>&motif;</application>-ra, sem pedig más X
- eszközrendszerre.</para>
+ szüksége sem a <application>&motif;</application>ra,
+ sem pedig más X-es eszközkészletre.</para>
<para>Az <application>Xpdf</application> csomagjának
felrakásához az alábbi parancs
@@ -1004,31 +1006,31 @@
&prompt.root; <userinput>make install clean</userinput></screen>
<para>Ahogy a telepítés befejezõdik, már
- el is indíthatjuk az <application>Xpdf</application>-et,
- ahol a jobb egérgombbal tudjuk aktiválni a
- menüt.</para>
+ el is indíthatjuk az <application>Xpdf</application>
+ alkalmazást, ahol a jobb egérgombbal tudjuk
+ aktiválni a menüt.</para>
+
</sect2>
<sect2>
<title>GQview</title>
- <indexterm>
- <primary><application>GQview</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>GQview</application></primary></indexterm>
<para>A <application>GQview</application> egy
képkezelõ. Állományokat tudunk
megnyitni benne egyetlen kattintással, külsõ
szerkesztõprogramot tudunk indítani vagy akár
még a képek kicsinyített változatait
- is láthatjuk, és így tovább.
+ is láthatjuk és így tovább.
Megtalálható benne a diavetítés
és az alapvetõ állománymûveletek.
Képgyûjteményeket is kezelhetünk
és könnyedén megtalálhatjuk a
bennük levõ képek között az
egyezõeket. A <application>GQview</application> teljes
- képernyõs nézegetést is megenged, ill.
- támogatja a honosítást.</para>
+ képernyõs nézegetést is megenged,
+ illetve támogatja a honosítást.</para>
<para>A <application>GQview</application> csomag
telepítéséhez ezt a parancsot kell
@@ -1042,6 +1044,7 @@
<screen>&prompt.root; <userinput>cd /usr/ports/graphics/gqview</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
+
</sect2>
</sect1>
@@ -1055,7 +1058,7 @@
csak a telepítésükre várnak.
Néhányuk közülük kompatibilis az
elterjedtebb állományformátumokkal, mint
- mondjuk amiben a <application><trademark
+ például amiben a <application><trademark
class="registered">Quicken</trademark></application> és az
<application>Excel</application> is tárolja az
adatait.</para>
@@ -1140,7 +1143,8 @@
dátumformátumot és pénznemet.</para>
<para>A <application>GnuCash</application>-t az alábbi
- módon tudjuk telepíteni a rendszerünkre:</para>
+ módon tudjuk telepíteni a
+ rendszerünkre:</para>
<screen>&prompt.root; <userinput>pkg_add -r gnucash</userinput></screen>
@@ -1149,13 +1153,13 @@
<screen>&prompt.root; <userinput>cd /usr/ports/finance/gnucash</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
+
</sect2>
<sect2>
<title>Gnumeric</title>
- <indexterm>
- <primary><application>Gnumeric</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>Gnumeric</application></primary></indexterm>
<indexterm>
<primary>táblázatkezelõ</primary>
<secondary><application>Gnumeric</application></secondary>
@@ -1163,21 +1167,21 @@
<para>A <application>Gnumeric</application> egy
táblázatkezelõ program, a
- <application>GNOME</application> asztalkörnyezet
+ <application>GNOME</application> munkakörnyezet
része. Sok esetben képes a helyzethez
alkalmazkodva automatikusan <quote>kitalálni</quote> a
felhasználó gondolatait a cellák
formátumának megfelelõ automatikus
kiegészítõ rendszerével. Be tud
olvasni számos népszerûbb formátumot,
- mint mondjuk az <application>Excel</application>,
+ mint például az <application>Excel</application>,
<application>Lotus 1-2-3</application> vagy a
<application>Quattro Pro</application>
állományait. A <filename
role="package">math/guppi</filename>
grafikonkészítõ programon keresztül
támogatja grafikonok rajzolását is. Nagy
- számû beépített funkcióval
+ számú beépített funkcióval
rendelkezik, és ismeri az összes megszokott
cellaformátumot, legyen az szám, pénznem,
dátum, idõ vagy bármi más.</para>
@@ -1193,13 +1197,13 @@
<screen>&prompt.root; <userinput>cd /usr/ports/math/gnumeric</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
+
</sect2>
<sect2>
<title>Abacus</title>
- <indexterm>
- <primary><application>Abacus</application></primary>
- </indexterm>
+
+ <indexterm><primary><application>Abacus</application></primary></indexterm>
<indexterm>
<primary>táblázatkezelõ</primary>
<secondary><application>Abacus</application></secondary>
@@ -1229,15 +1233,13 @@
<screen>&prompt.root; <userinput>cd /usr/ports/deskutils/abacus</userinput>
&prompt.root; <userinput>make install clean</userinput></screen>
+
</sect2>
<sect2>
<title>KMyMoney</title>
- <indexterm>
- <primary><application>KMyMoney</application></primary>
- </indexterm>
-
+ <indexterm><primary><application>KMyMoney</application></primary></indexterm>
<indexterm>
<primary>táblázatkezelõ</primary>
<secondary><application>KMyMoney</application></secondary>
@@ -1251,7 +1253,7 @@
kereskedelmi pénzügyi nyilvántartó
programban megtalálható fontosabb
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 05:08:38 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6C23F106567C; Fri, 25 Apr 2008 05:08:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 2C1E4106567A
for <perforce@freebsd.org>; Fri, 25 Apr 2008 05:08:38 +0000 (UTC)
(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 0F1018FC17
for <perforce@freebsd.org>; Fri, 25 Apr 2008 05:08:38 +0000 (UTC)
(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3P58bMY084850
for <perforce@freebsd.org>; Fri, 25 Apr 2008 05:08:37 GMT
(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3P58bje084848
for perforce@freebsd.org; Fri, 25 Apr 2008 05:08:37 GMT
(envelope-from thompsa@freebsd.org)
Date: Fri, 25 Apr 2008 05:08:37 GMT
Message-Id: <200804250508.m3P58bje084848@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140574 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 05:08:38 -0000
http://perforce.freebsd.org/chv.cgi?CH=140574
Change 140574 by thompsa@thompsa_burger on 2008/04/25 05:08:10
IFC @140565
Affected files ...
.. //depot/projects/vap/contrib/cvs/FREEBSD-vendstock#1 branch
.. //depot/projects/vap/contrib/cvs/src/filesubr.c#4 integrate
.. //depot/projects/vap/etc/defaults/rc.conf#11 integrate
.. //depot/projects/vap/etc/regdomain.xml#2 integrate
.. //depot/projects/vap/gnu/usr.bin/send-pr/categories#3 integrate
.. //depot/projects/vap/gnu/usr.bin/send-pr/send-pr.1#3 integrate
.. //depot/projects/vap/lib/libc/stdlib/malloc.c#6 integrate
.. //depot/projects/vap/lib/libc/stdlib/rb.h#1 branch
.. //depot/projects/vap/lib/libc/stdlib/strfmon.c#5 integrate
.. //depot/projects/vap/lib/libdisk/open_disk.c#3 integrate
.. //depot/projects/vap/lib/libdisk/open_ia64_disk.c#3 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_affinity.c#4 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_attr.c#5 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_create.c#5 integrate
.. //depot/projects/vap/lib/libthr/thread/thr_spinlock.c#3 integrate
.. //depot/projects/vap/sbin/ifconfig/regdomain.c#2 integrate
.. //depot/projects/vap/sbin/ifconfig/regdomain.h#2 integrate
.. //depot/projects/vap/share/man/man5/regdomain.5#2 integrate
.. //depot/projects/vap/share/misc/committers-doc.dot#5 integrate
.. //depot/projects/vap/sys/amd64/linux32/linux32_dummy.c#7 integrate
.. //depot/projects/vap/sys/compat/linux/linux_file.c#10 integrate
.. //depot/projects/vap/sys/contrib/dev/ral/LICENSE#3 integrate
.. //depot/projects/vap/sys/contrib/dev/ral/Makefile#3 integrate
.. //depot/projects/vap/sys/contrib/dev/ral/rt2561.fw.uu#3 integrate
.. //depot/projects/vap/sys/contrib/dev/ral/rt2561s.fw.uu#3 integrate
.. //depot/projects/vap/sys/contrib/dev/ral/rt2661.fw.uu#3 integrate
.. //depot/projects/vap/sys/contrib/dev/ral/rt2661_ucode.h#3 integrate
.. //depot/projects/vap/sys/contrib/dev/ral/rt2860.fw.uu#2 integrate
.. //depot/projects/vap/sys/dev/hme/if_hme.c#6 integrate
.. //depot/projects/vap/sys/dev/hme/if_hme_pci.c#6 integrate
.. //depot/projects/vap/sys/dev/hme/if_hme_sbus.c#6 integrate
.. //depot/projects/vap/sys/dev/hme/if_hmereg.h#5 integrate
.. //depot/projects/vap/sys/dev/hme/if_hmevar.h#5 integrate
.. //depot/projects/vap/sys/dev/sym/sym_hipd.c#6 integrate
.. //depot/projects/vap/sys/dev/vx/if_vx.c#6 integrate
.. //depot/projects/vap/sys/geom/part/g_part.c#6 integrate
.. //depot/projects/vap/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/vap/sys/geom/part/g_part_bsd.c#3 integrate
.. //depot/projects/vap/sys/geom/part/g_part_gpt.c#5 integrate
.. //depot/projects/vap/sys/geom/part/g_part_mbr.c#7 integrate
.. //depot/projects/vap/sys/geom/part/g_part_pc98.c#3 integrate
.. //depot/projects/vap/sys/geom/part/g_part_vtoc8.c#3 integrate
.. //depot/projects/vap/sys/i386/linux/linux_dummy.c#7 integrate
.. //depot/projects/vap/sys/kern/kern_descrip.c#13 integrate
.. //depot/projects/vap/sys/kern/vfs_subr.c#15 integrate
.. //depot/projects/vap/sys/modules/ralfw/Makefile#3 integrate
.. //depot/projects/vap/sys/modules/ralfw/Makefile.inc#2 integrate
.. //depot/projects/vap/sys/modules/ralfw/rt2561/Makefile#2 integrate
.. //depot/projects/vap/sys/modules/ralfw/rt2561s/Makefile#2 integrate
.. //depot/projects/vap/sys/modules/ralfw/rt2661/Makefile#2 integrate
.. //depot/projects/vap/sys/modules/wlan_rssadapt/Makefile#2 integrate
.. //depot/projects/vap/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_adhoc.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_adhoc.h#3 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_ddb.c#13 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_dfs.c#5 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_dfs.h#3 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_hostap.c#20 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_hostap.h#3 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_input.h#4 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_monitor.c#4 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_monitor.h#3 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_phy.c#6 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_phy.h#5 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_rssadapt.c#5 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_rssadapt.h#3 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_sta.c#11 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_sta.h#3 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_wds.c#7 integrate
.. //depot/projects/vap/sys/net80211/ieee80211_wds.h#3 integrate
.. //depot/projects/vap/sys/security/audit/audit.h#3 integrate
.. //depot/projects/vap/sys/sparc64/fhc/fhc.c#6 integrate
.. //depot/projects/vap/sys/sparc64/include/bus_common.h#5 integrate
.. //depot/projects/vap/sys/sparc64/include/intr_machdep.h#6 integrate
.. //depot/projects/vap/sys/sparc64/include/sysarch.h#3 integrate
.. //depot/projects/vap/sys/sparc64/pci/psycho.c#7 integrate
.. //depot/projects/vap/sys/sparc64/sbus/sbus.c#6 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/intr_machdep.c#10 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/mp_machdep.c#8 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/nexus.c#5 integrate
.. //depot/projects/vap/sys/sparc64/sparc64/upa.c#3 integrate
.. //depot/projects/vap/tools/tools/mctest/mctest.1#2 integrate
.. //depot/projects/vap/tools/tools/mctest/mctest.cc#3 integrate
.. //depot/projects/vap/tools/tools/mctest/mctest_run.sh#1 branch
.. //depot/projects/vap/tools/tools/net80211/scripts/config#6 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.dfs#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.fixed#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.local#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.mixed#3 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.simple#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.simple2#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.sta#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.tsn#4 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.updown#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.updown.wpa#5 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wds#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wdsmain#3 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wdsrelay#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wep#2 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa#5 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.aes#5 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa1.tkip#5 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2#5 integrate
.. //depot/projects/vap/tools/tools/net80211/scripts/setup.wpa2.tkip#5 integrate
.. //depot/projects/vap/tools/tools/net80211/wlanwds/Makefile#3 integrate
.. //depot/projects/vap/tools/tools/net80211/wlanwds/wlanwds.c#2 integrate
.. //depot/projects/vap/usr.bin/calendar/calendars/calendar.christian#3 integrate
.. //depot/projects/vap/usr.sbin/wpa/wpa_supplicant/driver_wired.c#2 integrate
Differences ...
==== //depot/projects/vap/contrib/cvs/src/filesubr.c#4 (text+ko) ====
@@ -17,10 +17,6 @@
definitions under operating systems (like, say, Windows NT) with different
file system semantics. */
-/*
- * $FreeBSD: src/contrib/cvs/src/filesubr.c,v 1.14 2008/01/13 06:06:15 obrien Exp $
- */
-
#include <assert.h>
#include "cvs.h"
==== //depot/projects/vap/etc/defaults/rc.conf#11 (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.332 2008/04/21 18:17:48 brooks Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.333 2008/04/23 22:40:59 brooks Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -33,7 +33,7 @@
apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO).
apmd_enable="NO" # Run apmd to handle APM event from userland.
apmd_flags="" # Flags to apmd (if enabled).
-ddb_enable="YES" # Load ddb scripts at boot.
+ddb_enable="NO" # Set to YES to load ddb scripts at boot.
ddb_config="/etc/ddb.conf" # ddb(8) config file.
devd_enable="YES" # Run devd, to trigger programs on device tree changes.
devd_flags="" # Additional flags for devd(8).
==== //depot/projects/vap/etc/regdomain.xml#2 (text+ko) ====
==== //depot/projects/vap/gnu/usr.bin/send-pr/categories#3 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.18 2006/07/17 10:36:56 ceri Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.19 2008/04/23 03:05:31 linimon Exp $
advocacy
alpha
amd64
+arm
bin
conf
docs
==== //depot/projects/vap/gnu/usr.bin/send-pr/send-pr.1#3 (text+ko) ====
@@ -22,7 +22,7 @@
.\"
.\" ---------------------------------------------------------------------------
.\"
-.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.20 2006/10/15 11:50:11 ceri Exp $
+.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.21 2008/04/23 03:05:31 linimon Exp $
.nh
.TH SEND-PR 1 3.113 "October 2006"
.SH NAME
@@ -191,6 +191,9 @@
.B amd64
AMD64 processor specific problems.
.TP
+.B arm
+ARM processor specific problems.
+.TP
.B bin
Corrections or enhancements to system executables.
.TP
==== //depot/projects/vap/lib/libc/stdlib/malloc.c#6 (text+ko) ====
@@ -128,7 +128,7 @@
#define MALLOC_DSS
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.167 2008/03/07 16:54:03 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.168 2008/04/23 16:09:18 jasone Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -142,7 +142,6 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/sysctl.h>
-#include <sys/tree.h>
#include <sys/uio.h>
#include <sys/ktrace.h> /* Must come after several other sys/ includes. */
@@ -175,6 +174,8 @@
#endif
#include <assert.h>
+#include "rb.h"
+
#ifdef MALLOC_DEBUG
/* Disable inlining to make debugging easier. */
# define inline
@@ -439,10 +440,10 @@
typedef struct extent_node_s extent_node_t;
struct extent_node_s {
/* Linkage for the size/address-ordered tree. */
- RB_ENTRY(extent_node_s) link_szad;
+ rb_node(extent_node_t) link_szad;
/* Linkage for the address-ordered tree. */
- RB_ENTRY(extent_node_s) link_ad;
+ rb_node(extent_node_t) link_ad;
/* Pointer to the extent that this tree node is responsible for. */
void *addr;
@@ -450,10 +451,7 @@
/* Total region size. */
size_t size;
};
-typedef struct extent_tree_szad_s extent_tree_szad_t;
-RB_HEAD(extent_tree_szad_s, extent_node_s);
-typedef struct extent_tree_ad_s extent_tree_ad_t;
-RB_HEAD(extent_tree_ad_s, extent_node_s);
+typedef rb_tree(extent_node_t) extent_tree_t;
/******************************************************************************/
/*
@@ -480,7 +478,7 @@
arena_t *arena;
/* Linkage for the arena's chunk tree. */
- RB_ENTRY(arena_chunk_s) link;
+ rb_node(arena_chunk_t) link;
/*
* Number of pages in use. This is maintained in order to make
@@ -495,7 +493,7 @@
* Tree of extent nodes that are embedded in the arena chunk header
* page(s). These nodes are used by arena_chunk_node_alloc().
*/
- extent_tree_ad_t nodes;
+ extent_tree_t nodes;
extent_node_t *nodes_past;
/*
@@ -505,13 +503,12 @@
*/
arena_chunk_map_t map[1]; /* Dynamically sized. */
};
-typedef struct arena_chunk_tree_s arena_chunk_tree_t;
-RB_HEAD(arena_chunk_tree_s, arena_chunk_s);
+typedef rb_tree(arena_chunk_t) arena_chunk_tree_t;
typedef struct arena_run_s arena_run_t;
struct arena_run_s {
/* Linkage for run trees. */
- RB_ENTRY(arena_run_s) link;
+ rb_node(arena_run_t) link;
#ifdef MALLOC_DEBUG
uint32_t magic;
@@ -530,8 +527,7 @@
/* Bitmask of in-use regions (0: in use, 1: free). */
unsigned regs_mask[1]; /* Dynamically sized. */
};
-typedef struct arena_run_tree_s arena_run_tree_t;
-RB_HEAD(arena_run_tree_s, arena_run_s);
+typedef rb_tree(arena_run_t) arena_run_tree_t;
struct arena_bin_s {
/*
@@ -613,11 +609,11 @@
* using one set of nodes, since one is needed for first-best-fit run
* allocation, and the other is needed for coalescing.
*/
- extent_tree_szad_t runs_avail_szad;
- extent_tree_ad_t runs_avail_ad;
+ extent_tree_t runs_avail_szad;
+ extent_tree_t runs_avail_ad;
/* Tree of this arena's allocated (in-use) runs. */
- extent_tree_ad_t runs_alloced_ad;
+ extent_tree_t runs_alloced_ad;
#ifdef MALLOC_BALANCE
/*
@@ -694,7 +690,7 @@
static malloc_mutex_t huge_mtx;
/* Tree of chunks that are stand-alone huge allocations. */
-static extent_tree_ad_t huge;
+static extent_tree_t huge;
#ifdef MALLOC_DSS
/*
@@ -715,8 +711,8 @@
* address space. Depending on function, different tree orderings are needed,
* which is why there are two trees with the same contents.
*/
-static extent_tree_szad_t dss_chunks_szad;
-static extent_tree_ad_t dss_chunks_ad;
+static extent_tree_t dss_chunks_szad;
+static extent_tree_t dss_chunks_ad;
#endif
#ifdef MALLOC_STATS
@@ -1431,9 +1427,20 @@
return (ret);
}
-/* Generate red-black tree code for size/address-ordered extents. */
-RB_GENERATE_STATIC(extent_tree_szad_s, extent_node_s, link_szad,
- extent_szad_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+extent_tree_szad_insert(extent_tree_t *tree, extent_node_t *extent)
+{
+
+ rb_insert(extent_node_t, link_szad, extent_szad_comp, tree, extent);
+}
+
+static void
+extent_tree_szad_remove(extent_tree_t *tree, extent_node_t *extent)
+{
+
+ rb_remove(extent_node_t, link_szad, extent_szad_comp, tree, extent);
+}
static inline int
extent_ad_comp(extent_node_t *a, extent_node_t *b)
@@ -1444,8 +1451,20 @@
return ((a_addr > b_addr) - (a_addr < b_addr));
}
-/* Generate red-black tree code for address-ordered extents. */
-RB_GENERATE_STATIC(extent_tree_ad_s, extent_node_s, link_ad, extent_ad_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+extent_tree_ad_insert(extent_tree_t *tree, extent_node_t *extent)
+{
+
+ rb_insert(extent_node_t, link_ad, extent_ad_comp, tree, extent);
+}
+
+static void
+extent_tree_ad_remove(extent_tree_t *tree, extent_node_t *extent)
+{
+
+ rb_remove(extent_node_t, link_ad, extent_ad_comp, tree, extent);
+}
/*
* End extent tree code.
@@ -1561,14 +1580,15 @@
key.addr = NULL;
key.size = size;
malloc_mutex_lock(&dss_mtx);
- node = RB_NFIND(extent_tree_szad_s, &dss_chunks_szad, &key);
+ rb_nsearch(extent_node_t, link_szad, extent_szad_comp, &dss_chunks_szad,
+ &key, node);
if (node != NULL) {
void *ret = node->addr;
/* Remove node from the tree. */
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
if (node->size == size) {
- RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad, node);
+ extent_tree_ad_remove(&dss_chunks_ad, node);
base_node_dealloc(node);
} else {
/*
@@ -1579,7 +1599,7 @@
assert(node->size > size);
node->addr = (void *)((uintptr_t)node->addr + size);
node->size -= size;
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
}
malloc_mutex_unlock(&dss_mtx);
@@ -1719,7 +1739,8 @@
extent_node_t *node, *prev, key;
key.addr = (void *)((uintptr_t)chunk + size);
- node = RB_NFIND(extent_tree_ad_s, &dss_chunks_ad, &key);
+ rb_nsearch(extent_node_t, link_ad, extent_ad_comp, &dss_chunks_ad,
+ &key, node);
/* Try to coalesce forward. */
if (node != NULL && node->addr == key.addr) {
/*
@@ -1727,10 +1748,10 @@
* not change the position within dss_chunks_ad, so only
* remove/insert from/into dss_chunks_szad.
*/
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
node->addr = chunk;
node->size += size;
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
} else {
/*
* Coalescing forward failed, so insert a new node. Drop
@@ -1744,12 +1765,13 @@
return (NULL);
node->addr = chunk;
node->size = size;
- RB_INSERT(extent_tree_ad_s, &dss_chunks_ad, node);
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_ad_insert(&dss_chunks_ad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
}
/* Try to coalesce backward. */
- prev = RB_PREV(extent_tree_ad_s, &dss_chunks_ad, node);
+ rb_prev(extent_node_t, link_ad, extent_ad_comp, &dss_chunks_ad, node,
+ prev);
if (prev != NULL && (void *)((uintptr_t)prev->addr + prev->size) ==
chunk) {
/*
@@ -1757,13 +1779,13 @@
* not change the position within dss_chunks_ad, so only
* remove/insert node from/into dss_chunks_szad.
*/
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, prev);
- RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad, prev);
+ extent_tree_szad_remove(&dss_chunks_szad, prev);
+ extent_tree_ad_remove(&dss_chunks_ad, prev);
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
node->addr = prev->addr;
node->size += prev->size;
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
base_node_dealloc(prev);
}
@@ -1803,10 +1825,8 @@
dss_max = (void *)((intptr_t)dss_prev - (intptr_t)size);
if (node != NULL) {
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad,
- node);
- RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad,
- node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
+ extent_tree_ad_remove(&dss_chunks_ad, node);
base_node_dealloc(node);
}
malloc_mutex_unlock(&dss_mtx);
@@ -1991,8 +2011,20 @@
return ((a_chunk > b_chunk) - (a_chunk < b_chunk));
}
-/* Generate red-black tree code for arena chunks. */
-RB_GENERATE_STATIC(arena_chunk_tree_s, arena_chunk_s, link, arena_chunk_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+arena_chunk_tree_insert(arena_chunk_tree_t *tree, arena_chunk_t *chunk)
+{
+
+ rb_insert(arena_chunk_t, link, arena_chunk_comp, tree, chunk);
+}
+
+static void
+arena_chunk_tree_remove(arena_chunk_tree_t *tree, arena_chunk_t *chunk)
+{
+
+ rb_remove(arena_chunk_t, link, arena_chunk_comp, tree, chunk);
+}
static inline int
arena_run_comp(arena_run_t *a, arena_run_t *b)
@@ -2006,17 +2038,29 @@
return ((a_run > b_run) - (a_run < b_run));
}
-/* Generate red-black tree code for arena runs. */
-RB_GENERATE_STATIC(arena_run_tree_s, arena_run_s, link, arena_run_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+arena_run_tree_insert(arena_run_tree_t *tree, arena_run_t *run)
+{
+
+ rb_insert(arena_run_t, link, arena_run_comp, tree, run);
+}
+
+static void
+arena_run_tree_remove(arena_run_tree_t *tree, arena_run_t *run)
+{
+
+ rb_remove(arena_run_t, link, arena_run_comp, tree, run);
+}
static extent_node_t *
arena_chunk_node_alloc(arena_chunk_t *chunk)
{
extent_node_t *ret;
- ret = RB_MIN(extent_tree_ad_s, &chunk->nodes);
+ rb_first(extent_node_t, link_ad, &chunk->nodes, ret);
if (ret != NULL)
- RB_REMOVE(extent_tree_ad_s, &chunk->nodes, ret);
+ extent_tree_ad_remove(&chunk->nodes, ret);
else {
ret = chunk->nodes_past;
chunk->nodes_past = (extent_node_t *)
@@ -2034,7 +2078,7 @@
{
node->addr = (void *)node;
- RB_INSERT(extent_tree_ad_s, &chunk->nodes, node);
+ extent_tree_ad_insert(&chunk->nodes, node);
}
static inline void *
@@ -2213,10 +2257,11 @@
nodeA = arena_chunk_node_alloc(chunk);
nodeA->addr = run;
nodeA->size = size;
- RB_INSERT(extent_tree_ad_s, &arena->runs_alloced_ad, nodeA);
+ extent_tree_ad_insert(&arena->runs_alloced_ad, nodeA);
key.addr = run;
- nodeB = RB_FIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp, &arena->runs_avail_ad,
+ &key, nodeB);
assert(nodeB != NULL);
run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk)
@@ -2253,7 +2298,7 @@
}
/* Keep track of trailing unused pages for later use. */
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+ extent_tree_szad_remove(&arena->runs_avail_szad, nodeB);
if (rem_pages > 0) {
/*
* Update nodeB in runs_avail_*. Its position within
@@ -2261,10 +2306,10 @@
*/
nodeB->addr = (void *)((uintptr_t)nodeB->addr + size);
nodeB->size -= size;
- RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+ extent_tree_szad_insert(&arena->runs_avail_szad, nodeB);
} else {
/* Remove nodeB from runs_avail_*. */
- RB_REMOVE(extent_tree_ad_s, &arena->runs_avail_ad, nodeB);
+ extent_tree_ad_remove(&arena->runs_avail_ad, nodeB);
arena_chunk_node_dealloc(chunk, nodeB);
}
@@ -2290,7 +2335,7 @@
chunk->arena = arena;
- RB_INSERT(arena_chunk_tree_s, &arena->chunks, chunk);
+ arena_chunk_tree_insert(&arena->chunks, chunk);
/*
* Claim that no pages are in use, since the header is merely
@@ -2310,7 +2355,7 @@
arena_chunk_header_npages));
/* Initialize the tree of unused extent nodes. */
- RB_INIT(&chunk->nodes);
+ rb_tree_new(extent_node_t, link_ad, &chunk->nodes);
chunk->nodes_past = (extent_node_t *)QUANTUM_CEILING(
(uintptr_t)&chunk->map[chunk_npages]);
}
@@ -2320,8 +2365,8 @@
node->addr = (void *)((uintptr_t)chunk + (arena_chunk_header_npages <<
pagesize_2pow));
node->size = chunksize - (arena_chunk_header_npages << pagesize_2pow);
- RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, node);
- RB_INSERT(extent_tree_ad_s, &arena->runs_avail_ad, node);
+ extent_tree_szad_insert(&arena->runs_avail_szad, node);
+ extent_tree_ad_insert(&arena->runs_avail_ad, node);
return (chunk);
}
@@ -2332,8 +2377,7 @@
extent_node_t *node, key;
if (arena->spare != NULL) {
- RB_REMOVE(arena_chunk_tree_s, &chunk->arena->chunks,
- arena->spare);
+ arena_chunk_tree_remove(&chunk->arena->chunks, arena->spare);
arena->ndirty -= arena->spare->ndirty;
chunk_dealloc((void *)arena->spare, chunksize);
#ifdef MALLOC_STATS
@@ -2349,10 +2393,11 @@
*/
key.addr = (void *)((uintptr_t)chunk + (arena_chunk_header_npages <<
pagesize_2pow));
- node = RB_FIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp, &arena->runs_avail_ad,
+ &key, node);
assert(node != NULL);
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, node);
- RB_REMOVE(extent_tree_ad_s, &arena->runs_avail_ad, node);
+ extent_tree_szad_remove(&arena->runs_avail_szad, node);
+ extent_tree_ad_remove(&arena->runs_avail_ad, node);
arena_chunk_node_dealloc(chunk, node);
arena->spare = chunk;
@@ -2372,7 +2417,8 @@
/* Search the arena's chunks for the lowest best fit. */
key.addr = NULL;
key.size = size;
- node = RB_NFIND(extent_tree_szad_s, &arena->runs_avail_szad, &key);
+ rb_nsearch(extent_node_t, link_szad, extent_szad_comp,
+ &arena->runs_avail_szad, &key, node);
if (node != NULL) {
run = (arena_run_t *)node->addr;
arena_run_split(arena, run, size, small, zero);
@@ -2400,9 +2446,9 @@
size_t ndirty;
ndirty = 0;
- RB_FOREACH(chunk, arena_chunk_tree_s, &arena->chunks) {
+ rb_foreach_begin(arena_chunk_t, link, &arena->chunks, chunk) {
ndirty += chunk->ndirty;
- }
+ } rb_foreach_end(arena_chunk_t, link, &arena->chunks, chunk)
assert(ndirty == arena->ndirty);
#endif
assert(arena->ndirty > opt_dirty_max);
@@ -2415,7 +2461,7 @@
* Iterate downward through chunks until enough dirty memory has been
* purged.
*/
- RB_FOREACH_REVERSE(chunk, arena_chunk_tree_s, &arena->chunks) {
+ rb_foreach_reverse_begin(arena_chunk_t, link, &arena->chunks, chunk) {
if (chunk->ndirty > 0) {
size_t i;
@@ -2453,7 +2499,7 @@
}
}
}
- }
+ } rb_foreach_reverse_end(arena_chunk_t, link, &arena->chunks, chunk)
}
static void
@@ -2465,9 +2511,10 @@
/* Remove run from runs_alloced_ad. */
key.addr = run;
- nodeB = RB_FIND(extent_tree_ad_s, &arena->runs_alloced_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_alloced_ad, &key, nodeB);
assert(nodeB != NULL);
- RB_REMOVE(extent_tree_ad_s, &arena->runs_alloced_ad, nodeB);
+ extent_tree_ad_remove(&arena->runs_alloced_ad, nodeB);
size = nodeB->size;
chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run);
@@ -2505,29 +2552,31 @@
/* Try to coalesce forward. */
key.addr = (void *)((uintptr_t)run + size);
- nodeC = RB_NFIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+ rb_nsearch(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_avail_ad, &key, nodeC);
if (nodeC != NULL && nodeC->addr == key.addr) {
/*
* Coalesce forward. This does not change the position within
* runs_avail_ad, so only remove/insert from/into
* runs_avail_szad.
*/
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, nodeC);
+ extent_tree_szad_remove(&arena->runs_avail_szad, nodeC);
nodeC->addr = (void *)run;
nodeC->size += size;
- RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, nodeC);
+ extent_tree_szad_insert(&arena->runs_avail_szad, nodeC);
arena_chunk_node_dealloc(chunk, nodeB);
nodeB = nodeC;
} else {
/*
* Coalescing forward failed, so insert nodeB into runs_avail_*.
*/
- RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
- RB_INSERT(extent_tree_ad_s, &arena->runs_avail_ad, nodeB);
+ extent_tree_szad_insert(&arena->runs_avail_szad, nodeB);
+ extent_tree_ad_insert(&arena->runs_avail_ad, nodeB);
}
/* Try to coalesce backward. */
- nodeA = RB_PREV(extent_tree_ad_s, &arena->runs_avail_ad, nodeB);
+ rb_prev(extent_node_t, link_ad, extent_ad_comp, &arena->runs_avail_ad,
+ nodeB, nodeA);
if (nodeA != NULL && (void *)((uintptr_t)nodeA->addr + nodeA->size) ==
(void *)run) {
/*
@@ -2535,13 +2584,13 @@
* position within runs_avail_ad, so only remove/insert
* from/into runs_avail_szad.
*/
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, nodeA);
- RB_REMOVE(extent_tree_ad_s, &arena->runs_avail_ad, nodeA);
+ extent_tree_szad_remove(&arena->runs_avail_szad, nodeA);
+ extent_tree_ad_remove(&arena->runs_avail_ad, nodeA);
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+ extent_tree_szad_remove(&arena->runs_avail_szad, nodeB);
nodeB->addr = nodeA->addr;
nodeB->size += nodeA->size;
- RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+ extent_tree_szad_insert(&arena->runs_avail_szad, nodeB);
arena_chunk_node_dealloc(chunk, nodeA);
}
@@ -2579,7 +2628,7 @@
nodeA = arena_chunk_node_alloc(chunk);
nodeA->addr = (void *)run;
nodeA->size = oldsize - newsize;
- RB_INSERT(extent_tree_ad_s, &arena->runs_alloced_ad, nodeA);
+ extent_tree_ad_insert(&arena->runs_alloced_ad, nodeA);
arena_run_dalloc(arena, (arena_run_t *)run, false);
}
@@ -2607,7 +2656,7 @@
nodeB = arena_chunk_node_alloc(chunk);
nodeB->addr = (void *)((uintptr_t)run + newsize);
nodeB->size = oldsize - newsize;
- RB_INSERT(extent_tree_ad_s, &arena->runs_alloced_ad, nodeB);
+ extent_tree_ad_insert(&arena->runs_alloced_ad, nodeB);
arena_run_dalloc(arena, (arena_run_t *)((uintptr_t)run + newsize),
dirty);
@@ -2620,9 +2669,10 @@
unsigned i, remainder;
/* Look for a usable run. */
- if ((run = RB_MIN(arena_run_tree_s, &bin->runs)) != NULL) {
+ rb_first(arena_run_t, link, &bin->runs, run);
+ if (run != NULL) {
/* run is guaranteed to have available space. */
- RB_REMOVE(arena_run_tree_s, &bin->runs, run);
+ arena_run_tree_remove(&bin->runs, run);
#ifdef MALLOC_STATS
bin->stats.reruns++;
#endif
@@ -2991,7 +3041,8 @@
* does not change.
*/
key.addr = ret;
- node = RB_FIND(extent_tree_ad_s, &arena->runs_alloced_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_alloced_ad, &key, node);
assert(node != NULL);
arena_run_trim_tail(arena, chunk, node, ret, alloc_size, size,
@@ -3004,7 +3055,8 @@
* does not change.
*/
key.addr = ret;
- node = RB_FIND(extent_tree_ad_s, &arena->runs_alloced_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_alloced_ad, &key, node);
assert(node != NULL);
leadsize = alignment - offset;
@@ -3164,7 +3216,8 @@
arena = chunk->arena;
malloc_spin_lock(&arena->lock);
key.addr = (void *)ptr;
- node = RB_FIND(extent_tree_ad_s, &arena->runs_alloced_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_alloced_ad, &key, node);
assert(node != NULL);
ret = node->size;
malloc_spin_unlock(&arena->lock);
@@ -3196,7 +3249,8 @@
/* Extract from tree of huge allocations. */
key.addr = __DECONST(void *, ptr);
- node = RB_FIND(extent_tree_ad_s, &huge, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp, &huge, &key,
+ node);
assert(node != NULL);
ret = node->size;
@@ -3238,7 +3292,7 @@
* run only contains one region, then it never gets
* inserted into the non-full runs tree.
*/
- RB_REMOVE(arena_run_tree_s, &bin->runs, run);
+ arena_run_tree_remove(&bin->runs, run);
}
#ifdef MALLOC_DEBUG
run->magic = 0;
@@ -3258,12 +3312,11 @@
/* Switch runcur. */
if (bin->runcur->nfree > 0) {
/* Insert runcur. */
- RB_INSERT(arena_run_tree_s, &bin->runs,
- bin->runcur);
+ arena_run_tree_insert(&bin->runs, bin->runcur);
}
bin->runcur = run;
} else
- RB_INSERT(arena_run_tree_s, &bin->runs, run);
+ arena_run_tree_insert(&bin->runs, run);
}
#ifdef MALLOC_STATS
arena->stats.allocated_small -= size;
@@ -3285,8 +3338,8 @@
size_t size;
key.addr = ptr;
- node = RB_FIND(extent_tree_ad_s,
- &arena->runs_alloced_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_alloced_ad, &key, node);
assert(node != NULL);
size = node->size;
#ifdef MALLOC_STATS
@@ -3362,7 +3415,8 @@
#else
malloc_spin_lock(&arena->lock);
#endif
- node = RB_FIND(extent_tree_ad_s, &arena->runs_alloced_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_alloced_ad, &key, node);
assert(node != NULL);
arena_run_trim_tail(arena, chunk, node, (arena_run_t *)ptr, oldsize,
size, true);
@@ -3386,7 +3440,8 @@
#else
malloc_spin_lock(&arena->lock);
#endif
- nodeC = RB_FIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp, &arena->runs_avail_ad,
+ &key, nodeC);
if (nodeC != NULL && oldsize + nodeC->size >= size) {
extent_node_t *nodeA, *nodeB;
@@ -3401,18 +3456,18 @@
oldsize, false, false);
key.addr = ptr;
- nodeA = RB_FIND(extent_tree_ad_s, &arena->runs_alloced_ad,
- &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_alloced_ad, &key, nodeA);
assert(nodeA != NULL);
key.addr = (void *)((uintptr_t)ptr + oldsize);
- nodeB = RB_FIND(extent_tree_ad_s, &arena->runs_alloced_ad,
- &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_alloced_ad, &key, nodeB);
assert(nodeB != NULL);
nodeA->size += nodeB->size;
- RB_REMOVE(extent_tree_ad_s, &arena->runs_alloced_ad, nodeB);
+ extent_tree_ad_remove(&arena->runs_alloced_ad, nodeB);
arena_chunk_node_dealloc(chunk, nodeB);
#ifdef MALLOC_STATS
@@ -3552,14 +3607,14 @@
#endif
/* Initialize chunks. */
- RB_INIT(&arena->chunks);
+ rb_tree_new(arena_chunk_t, link, &arena->chunks);
arena->spare = NULL;
arena->ndirty = 0;
- RB_INIT(&arena->runs_avail_szad);
- RB_INIT(&arena->runs_avail_ad);
- RB_INIT(&arena->runs_alloced_ad);
+ rb_tree_new(extent_node_t, link_szad, &arena->runs_avail_szad);
+ rb_tree_new(extent_node_t, link_ad, &arena->runs_avail_ad);
+ rb_tree_new(extent_node_t, link_ad, &arena->runs_alloced_ad);
#ifdef MALLOC_BALANCE
arena->contention = 0;
@@ -3572,7 +3627,7 @@
for (i = 0; i < ntbins; i++) {
bin = &arena->bins[i];
bin->runcur = NULL;
- RB_INIT(&bin->runs);
+ rb_tree_new(arena_run_t, link, &bin->runs);
bin->reg_size = (1U << (TINY_MIN_2POW + i));
@@ -3587,7 +3642,7 @@
for (; i < ntbins + nqbins; i++) {
bin = &arena->bins[i];
bin->runcur = NULL;
- RB_INIT(&bin->runs);
+ rb_tree_new(arena_run_t, link, &bin->runs);
bin->reg_size = quantum * (i - ntbins + 1);
@@ -3603,7 +3658,7 @@
for (; i < ntbins + nqbins + nsbins; i++) {
bin = &arena->bins[i];
bin->runcur = NULL;
- RB_INIT(&bin->runs);
+ rb_tree_new(arena_run_t, link, &bin->runs);
bin->reg_size = (small_max << (i - (ntbins + nqbins) + 1));
@@ -3689,7 +3744,7 @@
node->size = csize;
malloc_mutex_lock(&huge_mtx);
- RB_INSERT(extent_tree_ad_s, &huge, node);
+ extent_tree_ad_insert(&huge, node);
#ifdef MALLOC_STATS
huge_nmalloc++;
huge_allocated += csize;
@@ -3771,7 +3826,7 @@
node->size = chunk_size;
malloc_mutex_lock(&huge_mtx);
- RB_INSERT(extent_tree_ad_s, &huge, node);
+ extent_tree_ad_insert(&huge, node);
#ifdef MALLOC_STATS
huge_nmalloc++;
huge_allocated += chunk_size;
@@ -3829,10 +3884,10 @@
/* Extract from tree of huge allocations. */
key.addr = ptr;
- node = RB_FIND(extent_tree_ad_s, &huge, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp, &huge, &key, node);
assert(node != NULL);
assert(node->addr == ptr);
- RB_REMOVE(extent_tree_ad_s, &huge, node);
+ extent_tree_ad_remove(&huge, node);
#ifdef MALLOC_STATS
huge_ndalloc++;
@@ -4329,14 +4384,14 @@
/* Initialize chunks data. */
malloc_mutex_init(&huge_mtx);
- RB_INIT(&huge);
+ rb_tree_new(extent_node_t, link_ad, &huge);
#ifdef MALLOC_DSS
malloc_mutex_init(&dss_mtx);
dss_base = sbrk(0);
dss_prev = dss_base;
dss_max = dss_base;
- RB_INIT(&dss_chunks_szad);
- RB_INIT(&dss_chunks_ad);
+ rb_tree_new(extent_node_t, link_szad, &dss_chunks_szad);
+ rb_tree_new(extent_node_t, link_ad, &dss_chunks_ad);
#endif
#ifdef MALLOC_STATS
huge_nmalloc = 0;
==== //depot/projects/vap/lib/libc/stdlib/strfmon.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.18 2008/04/19 07:22:58 ru Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/strfmon.c,v 1.19 2008/04/24 07:49:00 ru Exp $");
#include <sys/types.h>
#include <ctype.h>
@@ -65,6 +65,8 @@
#define GET_NUMBER(VAR) do { \
VAR = 0; \
while (isdigit((unsigned char)*fmt)) { \
+ if (VAR > INT_MAX / 10) \
+ goto e2big_error; \
VAR *= 10; \
VAR += *fmt - '0'; \
if (VAR < 0) \
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 06:03:38 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0FFC9106567B; Fri, 25 Apr 2008 06:03:38 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C38EA106564A
for <perforce@freebsd.org>; Fri, 25 Apr 2008 06:03:37 +0000 (UTC)
(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id A8C6B8FC18
for <perforce@freebsd.org>; Fri, 25 Apr 2008 06:03:37 +0000 (UTC)
(envelope-from thompsa@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3P63bjM087920
for <perforce@freebsd.org>; Fri, 25 Apr 2008 06:03:37 GMT
(envelope-from thompsa@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3P63bS3087918
for perforce@freebsd.org; Fri, 25 Apr 2008 06:03:37 GMT
(envelope-from thompsa@freebsd.org)
Date: Fri, 25 Apr 2008 06:03:37 GMT
Message-Id: <200804250603.m3P63bS3087918@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
thompsa@freebsd.org using -f
From: Andrew Thompson <thompsa@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140577 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 06:03:38 -0000
http://perforce.freebsd.org/chv.cgi?CH=140577
Change 140577 by thompsa@thompsa_burger on 2008/04/25 06:02:37
Sync to HEAD.
Affected files ...
.. //depot/projects/vap/sys/dev/malo/if_malo.c#8 edit
Differences ...
==== //depot/projects/vap/sys/dev/malo/if_malo.c#8 (text+ko) ====
@@ -157,8 +157,8 @@
/*
* Read/Write shorthands for accesses to BAR 0. Note that all BAR 1
- * operations are done in the "hal" and there should be no reference to
- * them here.
+ * operations are done in the "hal" except getting H/W MAC address at
+ * malo_attach and there should be no reference to them here.
*/
static uint32_t
malo_bar0_read4(struct malo_softc *sc, bus_size_t off)
@@ -175,6 +175,12 @@
bus_space_write_4(sc->malo_io0t, sc->malo_io0h, off, val);
}
+static uint8_t
+malo_bar1_read1(struct malo_softc *sc, bus_size_t off)
+{
+ return bus_space_read_1(sc->malo_io1t, sc->malo_io1h, off);
+}
+
int
malo_attach(uint16_t devid, struct malo_softc *sc)
{
@@ -197,6 +203,16 @@
if_initname(ifp, device_get_name(sc->malo_dev),
device_get_unit(sc->malo_dev));
+ /*
+ * NB: get mac address from hardware directly here before we set DMAs
+ * for HAL because we don't want to disturb operations of HAL at BAR 1.
+ */
+ for (i = 0; i < IEEE80211_ADDR_LEN; i++) {
+ /* XXX remove a magic number but we don't have documents. */
+ ic->ic_myaddr[i] = malo_bar1_read1(sc, 0xa528 + i);
+ DELAY(1000);
+ }
+
mh = malo_hal_attach(sc->malo_dev, devid,
sc->malo_io1h, sc->malo_io1t, sc->malo_dmat);
if (mh == NULL) {
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 06:42:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id F1CFD1065679; Fri, 25 Apr 2008 06:42:21 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id B24211065675
for <perforce@freebsd.org>; Fri, 25 Apr 2008 06:42:21 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 944A88FC1C
for <perforce@freebsd.org>; Fri, 25 Apr 2008 06:42:21 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3P6gL59089122
for <perforce@freebsd.org>; Fri, 25 Apr 2008 06:42:21 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3P6gL2h089120
for perforce@freebsd.org; Fri, 25 Apr 2008 06:42:21 GMT
(envelope-from jb@freebsd.org)
Date: Fri, 25 Apr 2008 06:42:21 GMT
Message-Id: <200804250642.m3P6gL2h089120@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140580 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 06:42:22 -0000
http://perforce.freebsd.org/chv.cgi?CH=140580
Change 140580 by jb@freebsd3 on 2008/04/25 06:41:22
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#71 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#5 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#8 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#6 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#5 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#70 integrate
.. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile#8 integrate
.. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/linux-users/Makefile#1 branch
.. //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#1 branch
.. //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/bookinfo.ent#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/books.ent#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/catalog#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#3 integrate
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.ent#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/glossary/freebsd-glossary.sgml#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/mirrors-local.xsl#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/transtable-local.xsl#1 branch
.. //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/transtable.xml#1 branch
.. //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#13 integrate
.. //depot/projects/dtrace/ports/Mk/bsd.sites.mk#29 integrate
.. //depot/projects/dtrace/src/contrib/cvs/FREEBSD-vendstock#1 branch
.. //depot/projects/dtrace/src/contrib/cvs/src/filesubr.c#6 integrate
.. //depot/projects/dtrace/src/etc/defaults/rc.conf#33 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/send-pr/categories#5 integrate
.. //depot/projects/dtrace/src/gnu/usr.bin/send-pr/send-pr.1#5 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#21 integrate
.. //depot/projects/dtrace/src/lib/libc/stdlib/rb.h#1 branch
.. //depot/projects/dtrace/src/lib/libc/stdlib/strfmon.c#6 integrate
.. //depot/projects/dtrace/src/lib/libdisk/open_disk.c#5 integrate
.. //depot/projects/dtrace/src/lib/libdisk/open_ia64_disk.c#5 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_affinity.c#4 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_attr.c#9 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_create.c#11 integrate
.. //depot/projects/dtrace/src/lib/libthr/thread/thr_spinlock.c#6 integrate
.. //depot/projects/dtrace/src/lib/libutil/Makefile#7 integrate
.. //depot/projects/dtrace/src/lib/libutil/gr_util.c#1 branch
.. //depot/projects/dtrace/src/lib/libutil/libutil.h#7 integrate
.. //depot/projects/dtrace/src/share/misc/committers-doc.dot#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/amd64/machdep.c#28 integrate
.. //depot/projects/dtrace/src/sys/amd64/include/pcpu.h#5 integrate
.. //depot/projects/dtrace/src/sys/amd64/linux32/linux32_dummy.c#12 integrate
.. //depot/projects/dtrace/src/sys/arm/arm/machdep.c#8 integrate
.. //depot/projects/dtrace/src/sys/compat/linux/linux_file.c#16 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hme.c#8 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hme_pci.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hme_sbus.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hmereg.h#4 integrate
.. //depot/projects/dtrace/src/sys/dev/hme/if_hmevar.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/sym/sym_hipd.c#7 integrate
.. //depot/projects/dtrace/src/sys/dev/vx/if_vx.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part.c#8 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_bsd.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_gpt.c#6 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_mbr.c#5 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_pc98.c#3 integrate
.. //depot/projects/dtrace/src/sys/geom/part/g_part_vtoc8.c#3 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/machdep.c#28 integrate
.. //depot/projects/dtrace/src/sys/i386/include/pcpu.h#6 integrate
.. //depot/projects/dtrace/src/sys/i386/linux/linux_dummy.c#12 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#21 integrate
.. //depot/projects/dtrace/src/sys/kern/kern_descrip.c#26 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_4bsd.c#37 integrate
.. //depot/projects/dtrace/src/sys/kern/sched_ule.c#35 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_subr.c#38 integrate
.. //depot/projects/dtrace/src/sys/mips/mips/machdep.c#3 integrate
.. //depot/projects/dtrace/src/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/dtrace/src/sys/pc98/pc98/machdep.c#23 integrate
.. //depot/projects/dtrace/src/sys/powerpc/aim/machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/powerpc/booke/machdep.c#3 integrate
.. //depot/projects/dtrace/src/sys/security/audit/audit.h#8 integrate
.. //depot/projects/dtrace/src/sys/sparc64/fhc/fhc.c#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/bus_common.h#5 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/intr_machdep.h#7 integrate
.. //depot/projects/dtrace/src/sys/sparc64/include/sysarch.h#4 integrate
.. //depot/projects/dtrace/src/sys/sparc64/pci/psycho.c#11 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sbus/sbus.c#7 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/intr_machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/machdep.c#11 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/mp_machdep.c#9 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/nexus.c#6 integrate
.. //depot/projects/dtrace/src/sys/sparc64/sparc64/upa.c#3 integrate
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/machdep.c#15 integrate
.. //depot/projects/dtrace/src/sys/sys/proc.h#42 integrate
.. //depot/projects/dtrace/src/tools/regression/environ/envctl.c#3 integrate
.. //depot/projects/dtrace/src/tools/regression/environ/envtest.t#2 integrate
.. //depot/projects/dtrace/src/tools/regression/lib/libutil/Makefile#5 integrate
.. //depot/projects/dtrace/src/tools/regression/lib/libutil/test-grp.c#1 branch
.. //depot/projects/dtrace/src/tools/regression/lib/libutil/test-grp.t#1 branch
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest.1#2 integrate
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest.cc#3 integrate
.. //depot/projects/dtrace/src/tools/tools/mctest/mctest_run.sh#1 branch
.. //depot/projects/dtrace/src/usr.bin/calendar/calendars/calendar.christian#5 integrate
.. //depot/projects/dtrace/www/en/cgi/cvsweb.conf-freebsd#4 integrate
.. //depot/projects/dtrace/www/en/ports/categories#5 integrate
.. //depot/projects/dtrace/www/en/projects/summerofcode-2008.sgml#2 integrate
.. //depot/projects/dtrace/www/en/send-pr.sgml#7 integrate
.. //depot/projects/dtrace/www/ja/share/sgml/l10n.ent#3 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#71 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.786 2008/04/22 15:26:14 pgj Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.787 2008/04/24 05:48:43 osa Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -9347,6 +9347,11 @@
</listitem>
<listitem>
+ <para>Tofig Suleymanov
+ <email>tofig@freebsd.az</email></para>
+ </listitem>
+
+ <listitem>
<para>Tom
<email>root@majestix.cmr.no</email></para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/p4-primer/article.sgml#5 (text+ko) ====
@@ -23,7 +23,7 @@
</author>
</authorgroup>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.9 2007/09/09 09:03:34 danger Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/p4-primer/article.sgml,v 1.10 2008/04/24 19:44:25 danger Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -872,6 +872,10 @@
<para><filename
role="directory">//depot/projects/soc2007/<replaceable>project-name</replaceable>/...</filename></para>
</listitem>
+ <listitem>
+ <para><filename
+ role="directory">//depot/projects/soc2008/<replaceable>project-name</replaceable>/...</filename></para>
+ </listitem>
</itemizedlist>
<para>The project mentor is responsible for choosing a suitable
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml#8 (text+ko) ====
@@ -15,7 +15,7 @@
<articleinfo>
<title>Problem Report Handling Guidelines</title>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.29 2008/01/25 22:15:03 linimon Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/pr-guidelines/article.sgml,v 1.30 2008/04/23 09:30:01 linimon Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -292,7 +292,7 @@
<row>
<entry>architecture-specific</entry>
- <entry>alpha, i386, ia64, powerpc, sparc64</entry>
+ <entry>alpha, amd64, arm, i386, ia64, powerpc, sparc64</entry>
<entry>freebsd-<replaceable>arch</replaceable></entry>
</row>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/problem-reports/article.sgml#6 (text+ko) ====
@@ -7,7 +7,7 @@
<articleinfo>
<title>Writing &os; Problem Reports</title>
- <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.54 2008/02/03 08:54:34 linimon Exp $</pubdate>
+ <pubdate>$FreeBSD: doc/en_US.ISO8859-1/articles/problem-reports/article.sgml,v 1.55 2008/04/23 09:30:01 linimon Exp $</pubdate>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -907,6 +907,11 @@
</listitem>
<listitem>
+ <para><literal>arm:</literal> problems specific to the
+ ARM platform.</para>
+ </listitem>
+
+ <listitem>
<para><literal>bin:</literal> problems with userland
programs in the base system.</para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml#5 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml,v 1.58 2007/07/04 09:31:06 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/users/chapter.sgml,v 1.59 2008/04/24 16:17:44 roam Exp $
-->
<chapter id="users">
@@ -982,7 +982,7 @@
the <groupname>teamtwo</groupname> group.</para>
<example>
- <title>Adding Somebody to a Group Using &man.pw.8;</title>
+ <title>Setting the List of Members of a Group Using &man.pw.8;</title>
<screen>&prompt.root; <userinput>pw groupmod teamtwo -M jru</userinput>
&prompt.root; <userinput>pw groupshow teamtwo</userinput>
@@ -990,7 +990,7 @@
</example>
<para>The argument to the <option>-M</option> option is a
- comma-delimited list of users who are members of the group. From the
+ comma-delimited list of users who are to be in the group. From the
preceding sections, we know that the password file also contains a
group for each user. The latter (the user) is automatically added to
the group list by the system; the user will not show up as a member
@@ -1001,6 +1001,19 @@
additionally data from <filename>/etc/passwd</filename>.</para>
<example>
+ <title>Adding a New Member to a Group Using &man.pw.8;</title>
+
+ <screen>&prompt.root; <userinput>pw groupmod teamtwo -m db</userinput>
+&prompt.root; <userinput>pw groupshow teamtwo</userinput>
+teamtwo:*:1100:jru,db</screen>
+ </example>
+
+ <para>The argument to the <option>-m</option> option is a
+ comma-delimited list of users who are to be added to the group. Unlike
+ the previous example, these users are added to the group and do not
+ replace the list of users in the group.</para>
+
+ <example>
<title>Using &man.id.1; to Determine Group Membership</title>
<screen>&prompt.user; <userinput>id jru</userinput>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#70 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.926 2008/04/21 16:48:24 jkim Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.927 2008/04/23 01:58:05 linimon Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -1556,14 +1556,14 @@
</row>
<row>
- <entry><filename>graphics</filename></entry>
- <entry>Graphics utilities.</entry>
+ <entry><filename>gnustep*</filename></entry>
+ <entry>Software related to the GNUstep desktop environment.</entry>
<entry></entry>
</row>
<row>
- <entry><filename>gnustep*</filename></entry>
- <entry>Software related to the GNUstep desktop environment.</entry>
+ <entry><filename>graphics</filename></entry>
+ <entry>Graphics utilities.</entry>
<entry></entry>
</row>
==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/articles/Makefile#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.11 2008/03/31 16:58:38 carvay Exp $
+# $FreeBSD: doc/es_ES.ISO8859-1/articles/Makefile,v 1.12 2008/04/24 19:11:13 carvay Exp $
# $FreeBSDes: doc/es_ES.ISO8859-1/articles/Makefile,v 1.3 2004/10/09 02:01:17 jesusr Exp $
SUBDIR =
@@ -12,6 +12,7 @@
SUBDIR+= fdp-es
SUBDIR+= laptop
SUBDIR+= linux-comparison
+SUBDIR+= linux-users
SUBDIR+= mailing-list-faq
SUBDIR+= nanobsd
SUBDIR+= p4-primer
==== //depot/projects/dtrace/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#3 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl,v 1.10 2004/02/01 19:59:22 jesusr Exp $ -->
+<!-- $FreeBSD: doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl,v 1.11 2008/04/24 21:40:03 carvay Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
@@ -22,7 +22,7 @@
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
- (literal "Éste y otros documentos pueden obtenerse en ")
+ (literal "Puede descargar éste y muchos otros documentos desde ")
(create-link
(list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
(literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
@@ -30,17 +30,17 @@
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
- (literal "Para preguntas acerca de FreeBSD, leer la ")
+ (literal "Si tiene dudas sobre FreeBSD consulte la ")
(create-link
(list (list "HREF" "http://www.FreeBSD.org/docs.html"))
(literal "documentación"))
- (literal " antes de contactar con la lista <")
+ (literal " antes de escribir a la lista <")
(create-link
(list (list "HREF" "mailto:questions@FreeBSD.org"))
(literal "questions@FreeBSD.org"))
(literal ">.")
(make empty-element gi: "br")
- (literal "Para preguntas acerca de esta documentación, e-mail a <")
+ (literal "Envíe sus preguntas sobre la documentación a <")
(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))))
==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/catalog#3 (text+ko) ====
@@ -4,22 +4,28 @@
-- ...................................................................... --
-- Hungarian specific ...................................................... --
- -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.2 2007/10/01 13:37:44 gabor Exp $ --
+ -- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/catalog,v 1.3 2008/04/24 18:34:27 pgj Exp $ --
PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//HU"
"articles.ent"
-PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//EN"
+PUBLIC "-//FreeBSD//ENTITIES DocBook BookInfo Entities//HU"
+ "bookinfo.ent"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Books Entity Set//HU"
"books.ent"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//EN"
- "freebsd.dsl"
+ "freebsd.dsl"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Stylesheet//HU"
"freebsd.dsl"
PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//HU"
- "freebsd.dsl"
+ "freebsd.dsl"
+
+PUBLIC "-//FreeBSD//ENTITIES DocBook Miscellaneous FreeBSD Entities//HU"
+ "freebsd.ent"
PUBLIC "-//FreeBSD//ENTITIES DocBook Language Specific Entities//EN"
"l10n.ent"
==== //depot/projects/dtrace/doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl#3 (text+ko) ====
@@ -1,8 +1,8 @@
<!--
- $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.2 2007/10/01 13:37:44 gabor Exp $
+ $FreeBSD: doc/hu_HU.ISO8859-2/share/sgml/freebsd.dsl,v 1.3 2008/04/24 18:34:27 pgj Exp $
The FreeBSD Hungarian Documentation Project
Translated by: Gabor Kovesdan <gabor@FreeBSD.org>
- Original revision: 1.20
+ Original revision: 1.22
-->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
==== //depot/projects/dtrace/ports/Mk/bsd.gnustep.mk#13 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.46 2008/04/19 17:46:02 miwi Exp $
+# $FreeBSD: ports/Mk/bsd.gnustep.mk,v 1.48 2008/04/24 05:04:25 dinoex Exp $
#
# This file contains some variable definitions that are supposed to
# make your life easier when dealing with ports related to the GNUstep.
@@ -515,9 +515,11 @@
#
.if defined(USE_GNUSTEP_LDCONFIG)
.for i in ${USE_GNUSTEP_LDCONFIG}
+# don't remove INSTALLS_SHLIB, see ports/123042
+#USE_LDCONFIG+= ${i}
LDCONFIG_DIRS+= ${i}
.endfor
-USE_LDCONFIG= yes
+INSTALLS_SHLIB= yes
.endif
# eof
==== //depot/projects/dtrace/ports/Mk/bsd.sites.mk#29 (text+ko) ====
@@ -20,7 +20,7 @@
#
# Note: all entries should terminate with a slash.
#
-# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.445 2008/04/16 21:58:03 pav Exp $
+# $FreeBSD: ports/Mk/bsd.sites.mk,v 1.446 2008/04/24 04:27:34 vanilla Exp $
#
# Where to put distfiles that don't have any other master site
@@ -383,8 +383,6 @@
ftp://ftp.port80.se/fedora/core/%SUBDIR%/ \
http://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \
ftp://ftp.upjs.sk/pub/fedora/linux/core/%SUBDIR%/ \
- http://ftp.mirror.tw/pub/fedora/linux/core/%SUBDIR%/ \
- ftp://ftp.mirror.tw/pub/fedora/linux/core/%SUBDIR%/ \
ftp://ftp.tlk-l.net/pub/mirrors/fedora.redhat.com/linux/core/%SUBDIR%/ \
http://limestone.uoregon.edu/ftp/fedora/%SUBDIR%/ \
ftp://limestone.uoregon.edu/fedora/%SUBDIR%/ \
==== //depot/projects/dtrace/src/contrib/cvs/src/filesubr.c#6 (text+ko) ====
@@ -17,10 +17,6 @@
definitions under operating systems (like, say, Windows NT) with different
file system semantics. */
-/*
- * $FreeBSD: src/contrib/cvs/src/filesubr.c,v 1.14 2008/01/13 06:06:15 obrien Exp $
- */
-
#include <assert.h>
#include "cvs.h"
==== //depot/projects/dtrace/src/etc/defaults/rc.conf#33 (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.332 2008/04/21 18:17:48 brooks Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.333 2008/04/23 22:40:59 brooks Exp $
##############################################################
### Important initial Boot-time options ####################
@@ -33,7 +33,7 @@
apm_enable="NO" # Set to YES to enable APM BIOS functions (or NO).
apmd_enable="NO" # Run apmd to handle APM event from userland.
apmd_flags="" # Flags to apmd (if enabled).
-ddb_enable="YES" # Load ddb scripts at boot.
+ddb_enable="NO" # Set to YES to load ddb scripts at boot.
ddb_config="/etc/ddb.conf" # ddb(8) config file.
devd_enable="YES" # Run devd, to trigger programs on device tree changes.
devd_flags="" # Additional flags for devd(8).
==== //depot/projects/dtrace/src/gnu/usr.bin/send-pr/categories#5 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.18 2006/07/17 10:36:56 ceri Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.19 2008/04/23 03:05:31 linimon Exp $
advocacy
alpha
amd64
+arm
bin
conf
docs
==== //depot/projects/dtrace/src/gnu/usr.bin/send-pr/send-pr.1#5 (text+ko) ====
@@ -22,7 +22,7 @@
.\"
.\" ---------------------------------------------------------------------------
.\"
-.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.20 2006/10/15 11:50:11 ceri Exp $
+.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.21 2008/04/23 03:05:31 linimon Exp $
.nh
.TH SEND-PR 1 3.113 "October 2006"
.SH NAME
@@ -191,6 +191,9 @@
.B amd64
AMD64 processor specific problems.
.TP
+.B arm
+ARM processor specific problems.
+.TP
.B bin
Corrections or enhancements to system executables.
.TP
==== //depot/projects/dtrace/src/lib/libc/stdlib/malloc.c#21 (text+ko) ====
@@ -128,7 +128,7 @@
#define MALLOC_DSS
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.167 2008/03/07 16:54:03 jasone Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/stdlib/malloc.c,v 1.168 2008/04/23 16:09:18 jasone Exp $");
#include "libc_private.h"
#ifdef MALLOC_DEBUG
@@ -142,7 +142,6 @@
#include <sys/time.h>
#include <sys/types.h>
#include <sys/sysctl.h>
-#include <sys/tree.h>
#include <sys/uio.h>
#include <sys/ktrace.h> /* Must come after several other sys/ includes. */
@@ -175,6 +174,8 @@
#endif
#include <assert.h>
+#include "rb.h"
+
#ifdef MALLOC_DEBUG
/* Disable inlining to make debugging easier. */
# define inline
@@ -439,10 +440,10 @@
typedef struct extent_node_s extent_node_t;
struct extent_node_s {
/* Linkage for the size/address-ordered tree. */
- RB_ENTRY(extent_node_s) link_szad;
+ rb_node(extent_node_t) link_szad;
/* Linkage for the address-ordered tree. */
- RB_ENTRY(extent_node_s) link_ad;
+ rb_node(extent_node_t) link_ad;
/* Pointer to the extent that this tree node is responsible for. */
void *addr;
@@ -450,10 +451,7 @@
/* Total region size. */
size_t size;
};
-typedef struct extent_tree_szad_s extent_tree_szad_t;
-RB_HEAD(extent_tree_szad_s, extent_node_s);
-typedef struct extent_tree_ad_s extent_tree_ad_t;
-RB_HEAD(extent_tree_ad_s, extent_node_s);
+typedef rb_tree(extent_node_t) extent_tree_t;
/******************************************************************************/
/*
@@ -480,7 +478,7 @@
arena_t *arena;
/* Linkage for the arena's chunk tree. */
- RB_ENTRY(arena_chunk_s) link;
+ rb_node(arena_chunk_t) link;
/*
* Number of pages in use. This is maintained in order to make
@@ -495,7 +493,7 @@
* Tree of extent nodes that are embedded in the arena chunk header
* page(s). These nodes are used by arena_chunk_node_alloc().
*/
- extent_tree_ad_t nodes;
+ extent_tree_t nodes;
extent_node_t *nodes_past;
/*
@@ -505,13 +503,12 @@
*/
arena_chunk_map_t map[1]; /* Dynamically sized. */
};
-typedef struct arena_chunk_tree_s arena_chunk_tree_t;
-RB_HEAD(arena_chunk_tree_s, arena_chunk_s);
+typedef rb_tree(arena_chunk_t) arena_chunk_tree_t;
typedef struct arena_run_s arena_run_t;
struct arena_run_s {
/* Linkage for run trees. */
- RB_ENTRY(arena_run_s) link;
+ rb_node(arena_run_t) link;
#ifdef MALLOC_DEBUG
uint32_t magic;
@@ -530,8 +527,7 @@
/* Bitmask of in-use regions (0: in use, 1: free). */
unsigned regs_mask[1]; /* Dynamically sized. */
};
-typedef struct arena_run_tree_s arena_run_tree_t;
-RB_HEAD(arena_run_tree_s, arena_run_s);
+typedef rb_tree(arena_run_t) arena_run_tree_t;
struct arena_bin_s {
/*
@@ -613,11 +609,11 @@
* using one set of nodes, since one is needed for first-best-fit run
* allocation, and the other is needed for coalescing.
*/
- extent_tree_szad_t runs_avail_szad;
- extent_tree_ad_t runs_avail_ad;
+ extent_tree_t runs_avail_szad;
+ extent_tree_t runs_avail_ad;
/* Tree of this arena's allocated (in-use) runs. */
- extent_tree_ad_t runs_alloced_ad;
+ extent_tree_t runs_alloced_ad;
#ifdef MALLOC_BALANCE
/*
@@ -694,7 +690,7 @@
static malloc_mutex_t huge_mtx;
/* Tree of chunks that are stand-alone huge allocations. */
-static extent_tree_ad_t huge;
+static extent_tree_t huge;
#ifdef MALLOC_DSS
/*
@@ -715,8 +711,8 @@
* address space. Depending on function, different tree orderings are needed,
* which is why there are two trees with the same contents.
*/
-static extent_tree_szad_t dss_chunks_szad;
-static extent_tree_ad_t dss_chunks_ad;
+static extent_tree_t dss_chunks_szad;
+static extent_tree_t dss_chunks_ad;
#endif
#ifdef MALLOC_STATS
@@ -1431,9 +1427,20 @@
return (ret);
}
-/* Generate red-black tree code for size/address-ordered extents. */
-RB_GENERATE_STATIC(extent_tree_szad_s, extent_node_s, link_szad,
- extent_szad_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+extent_tree_szad_insert(extent_tree_t *tree, extent_node_t *extent)
+{
+
+ rb_insert(extent_node_t, link_szad, extent_szad_comp, tree, extent);
+}
+
+static void
+extent_tree_szad_remove(extent_tree_t *tree, extent_node_t *extent)
+{
+
+ rb_remove(extent_node_t, link_szad, extent_szad_comp, tree, extent);
+}
static inline int
extent_ad_comp(extent_node_t *a, extent_node_t *b)
@@ -1444,8 +1451,20 @@
return ((a_addr > b_addr) - (a_addr < b_addr));
}
-/* Generate red-black tree code for address-ordered extents. */
-RB_GENERATE_STATIC(extent_tree_ad_s, extent_node_s, link_ad, extent_ad_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+extent_tree_ad_insert(extent_tree_t *tree, extent_node_t *extent)
+{
+
+ rb_insert(extent_node_t, link_ad, extent_ad_comp, tree, extent);
+}
+
+static void
+extent_tree_ad_remove(extent_tree_t *tree, extent_node_t *extent)
+{
+
+ rb_remove(extent_node_t, link_ad, extent_ad_comp, tree, extent);
+}
/*
* End extent tree code.
@@ -1561,14 +1580,15 @@
key.addr = NULL;
key.size = size;
malloc_mutex_lock(&dss_mtx);
- node = RB_NFIND(extent_tree_szad_s, &dss_chunks_szad, &key);
+ rb_nsearch(extent_node_t, link_szad, extent_szad_comp, &dss_chunks_szad,
+ &key, node);
if (node != NULL) {
void *ret = node->addr;
/* Remove node from the tree. */
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
if (node->size == size) {
- RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad, node);
+ extent_tree_ad_remove(&dss_chunks_ad, node);
base_node_dealloc(node);
} else {
/*
@@ -1579,7 +1599,7 @@
assert(node->size > size);
node->addr = (void *)((uintptr_t)node->addr + size);
node->size -= size;
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
}
malloc_mutex_unlock(&dss_mtx);
@@ -1719,7 +1739,8 @@
extent_node_t *node, *prev, key;
key.addr = (void *)((uintptr_t)chunk + size);
- node = RB_NFIND(extent_tree_ad_s, &dss_chunks_ad, &key);
+ rb_nsearch(extent_node_t, link_ad, extent_ad_comp, &dss_chunks_ad,
+ &key, node);
/* Try to coalesce forward. */
if (node != NULL && node->addr == key.addr) {
/*
@@ -1727,10 +1748,10 @@
* not change the position within dss_chunks_ad, so only
* remove/insert from/into dss_chunks_szad.
*/
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
node->addr = chunk;
node->size += size;
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
} else {
/*
* Coalescing forward failed, so insert a new node. Drop
@@ -1744,12 +1765,13 @@
return (NULL);
node->addr = chunk;
node->size = size;
- RB_INSERT(extent_tree_ad_s, &dss_chunks_ad, node);
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_ad_insert(&dss_chunks_ad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
}
/* Try to coalesce backward. */
- prev = RB_PREV(extent_tree_ad_s, &dss_chunks_ad, node);
+ rb_prev(extent_node_t, link_ad, extent_ad_comp, &dss_chunks_ad, node,
+ prev);
if (prev != NULL && (void *)((uintptr_t)prev->addr + prev->size) ==
chunk) {
/*
@@ -1757,13 +1779,13 @@
* not change the position within dss_chunks_ad, so only
* remove/insert node from/into dss_chunks_szad.
*/
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, prev);
- RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad, prev);
+ extent_tree_szad_remove(&dss_chunks_szad, prev);
+ extent_tree_ad_remove(&dss_chunks_ad, prev);
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
node->addr = prev->addr;
node->size += prev->size;
- RB_INSERT(extent_tree_szad_s, &dss_chunks_szad, node);
+ extent_tree_szad_insert(&dss_chunks_szad, node);
base_node_dealloc(prev);
}
@@ -1803,10 +1825,8 @@
dss_max = (void *)((intptr_t)dss_prev - (intptr_t)size);
if (node != NULL) {
- RB_REMOVE(extent_tree_szad_s, &dss_chunks_szad,
- node);
- RB_REMOVE(extent_tree_ad_s, &dss_chunks_ad,
- node);
+ extent_tree_szad_remove(&dss_chunks_szad, node);
+ extent_tree_ad_remove(&dss_chunks_ad, node);
base_node_dealloc(node);
}
malloc_mutex_unlock(&dss_mtx);
@@ -1991,8 +2011,20 @@
return ((a_chunk > b_chunk) - (a_chunk < b_chunk));
}
-/* Generate red-black tree code for arena chunks. */
-RB_GENERATE_STATIC(arena_chunk_tree_s, arena_chunk_s, link, arena_chunk_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+arena_chunk_tree_insert(arena_chunk_tree_t *tree, arena_chunk_t *chunk)
+{
+
+ rb_insert(arena_chunk_t, link, arena_chunk_comp, tree, chunk);
+}
+
+static void
+arena_chunk_tree_remove(arena_chunk_tree_t *tree, arena_chunk_t *chunk)
+{
+
+ rb_remove(arena_chunk_t, link, arena_chunk_comp, tree, chunk);
+}
static inline int
arena_run_comp(arena_run_t *a, arena_run_t *b)
@@ -2006,17 +2038,29 @@
return ((a_run > b_run) - (a_run < b_run));
}
-/* Generate red-black tree code for arena runs. */
-RB_GENERATE_STATIC(arena_run_tree_s, arena_run_s, link, arena_run_comp)
+/* Wrap large red-black tree macros in functions. */
+static void
+arena_run_tree_insert(arena_run_tree_t *tree, arena_run_t *run)
+{
+
+ rb_insert(arena_run_t, link, arena_run_comp, tree, run);
+}
+
+static void
+arena_run_tree_remove(arena_run_tree_t *tree, arena_run_t *run)
+{
+
+ rb_remove(arena_run_t, link, arena_run_comp, tree, run);
+}
static extent_node_t *
arena_chunk_node_alloc(arena_chunk_t *chunk)
{
extent_node_t *ret;
- ret = RB_MIN(extent_tree_ad_s, &chunk->nodes);
+ rb_first(extent_node_t, link_ad, &chunk->nodes, ret);
if (ret != NULL)
- RB_REMOVE(extent_tree_ad_s, &chunk->nodes, ret);
+ extent_tree_ad_remove(&chunk->nodes, ret);
else {
ret = chunk->nodes_past;
chunk->nodes_past = (extent_node_t *)
@@ -2034,7 +2078,7 @@
{
node->addr = (void *)node;
- RB_INSERT(extent_tree_ad_s, &chunk->nodes, node);
+ extent_tree_ad_insert(&chunk->nodes, node);
}
static inline void *
@@ -2213,10 +2257,11 @@
nodeA = arena_chunk_node_alloc(chunk);
nodeA->addr = run;
nodeA->size = size;
- RB_INSERT(extent_tree_ad_s, &arena->runs_alloced_ad, nodeA);
+ extent_tree_ad_insert(&arena->runs_alloced_ad, nodeA);
key.addr = run;
- nodeB = RB_FIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp, &arena->runs_avail_ad,
+ &key, nodeB);
assert(nodeB != NULL);
run_ind = (unsigned)(((uintptr_t)run - (uintptr_t)chunk)
@@ -2253,7 +2298,7 @@
}
/* Keep track of trailing unused pages for later use. */
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+ extent_tree_szad_remove(&arena->runs_avail_szad, nodeB);
if (rem_pages > 0) {
/*
* Update nodeB in runs_avail_*. Its position within
@@ -2261,10 +2306,10 @@
*/
nodeB->addr = (void *)((uintptr_t)nodeB->addr + size);
nodeB->size -= size;
- RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, nodeB);
+ extent_tree_szad_insert(&arena->runs_avail_szad, nodeB);
} else {
/* Remove nodeB from runs_avail_*. */
- RB_REMOVE(extent_tree_ad_s, &arena->runs_avail_ad, nodeB);
+ extent_tree_ad_remove(&arena->runs_avail_ad, nodeB);
arena_chunk_node_dealloc(chunk, nodeB);
}
@@ -2290,7 +2335,7 @@
chunk->arena = arena;
- RB_INSERT(arena_chunk_tree_s, &arena->chunks, chunk);
+ arena_chunk_tree_insert(&arena->chunks, chunk);
/*
* Claim that no pages are in use, since the header is merely
@@ -2310,7 +2355,7 @@
arena_chunk_header_npages));
/* Initialize the tree of unused extent nodes. */
- RB_INIT(&chunk->nodes);
+ rb_tree_new(extent_node_t, link_ad, &chunk->nodes);
chunk->nodes_past = (extent_node_t *)QUANTUM_CEILING(
(uintptr_t)&chunk->map[chunk_npages]);
}
@@ -2320,8 +2365,8 @@
node->addr = (void *)((uintptr_t)chunk + (arena_chunk_header_npages <<
pagesize_2pow));
node->size = chunksize - (arena_chunk_header_npages << pagesize_2pow);
- RB_INSERT(extent_tree_szad_s, &arena->runs_avail_szad, node);
- RB_INSERT(extent_tree_ad_s, &arena->runs_avail_ad, node);
+ extent_tree_szad_insert(&arena->runs_avail_szad, node);
+ extent_tree_ad_insert(&arena->runs_avail_ad, node);
return (chunk);
}
@@ -2332,8 +2377,7 @@
extent_node_t *node, key;
if (arena->spare != NULL) {
- RB_REMOVE(arena_chunk_tree_s, &chunk->arena->chunks,
- arena->spare);
+ arena_chunk_tree_remove(&chunk->arena->chunks, arena->spare);
arena->ndirty -= arena->spare->ndirty;
chunk_dealloc((void *)arena->spare, chunksize);
#ifdef MALLOC_STATS
@@ -2349,10 +2393,11 @@
*/
key.addr = (void *)((uintptr_t)chunk + (arena_chunk_header_npages <<
pagesize_2pow));
- node = RB_FIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp, &arena->runs_avail_ad,
+ &key, node);
assert(node != NULL);
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, node);
- RB_REMOVE(extent_tree_ad_s, &arena->runs_avail_ad, node);
+ extent_tree_szad_remove(&arena->runs_avail_szad, node);
+ extent_tree_ad_remove(&arena->runs_avail_ad, node);
arena_chunk_node_dealloc(chunk, node);
arena->spare = chunk;
@@ -2372,7 +2417,8 @@
/* Search the arena's chunks for the lowest best fit. */
key.addr = NULL;
key.size = size;
- node = RB_NFIND(extent_tree_szad_s, &arena->runs_avail_szad, &key);
+ rb_nsearch(extent_node_t, link_szad, extent_szad_comp,
+ &arena->runs_avail_szad, &key, node);
if (node != NULL) {
run = (arena_run_t *)node->addr;
arena_run_split(arena, run, size, small, zero);
@@ -2400,9 +2446,9 @@
size_t ndirty;
ndirty = 0;
- RB_FOREACH(chunk, arena_chunk_tree_s, &arena->chunks) {
+ rb_foreach_begin(arena_chunk_t, link, &arena->chunks, chunk) {
ndirty += chunk->ndirty;
- }
+ } rb_foreach_end(arena_chunk_t, link, &arena->chunks, chunk)
assert(ndirty == arena->ndirty);
#endif
assert(arena->ndirty > opt_dirty_max);
@@ -2415,7 +2461,7 @@
* Iterate downward through chunks until enough dirty memory has been
* purged.
*/
- RB_FOREACH_REVERSE(chunk, arena_chunk_tree_s, &arena->chunks) {
+ rb_foreach_reverse_begin(arena_chunk_t, link, &arena->chunks, chunk) {
if (chunk->ndirty > 0) {
size_t i;
@@ -2453,7 +2499,7 @@
}
}
}
- }
+ } rb_foreach_reverse_end(arena_chunk_t, link, &arena->chunks, chunk)
}
static void
@@ -2465,9 +2511,10 @@
/* Remove run from runs_alloced_ad. */
key.addr = run;
- nodeB = RB_FIND(extent_tree_ad_s, &arena->runs_alloced_ad, &key);
+ rb_search(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_alloced_ad, &key, nodeB);
assert(nodeB != NULL);
- RB_REMOVE(extent_tree_ad_s, &arena->runs_alloced_ad, nodeB);
+ extent_tree_ad_remove(&arena->runs_alloced_ad, nodeB);
size = nodeB->size;
chunk = (arena_chunk_t *)CHUNK_ADDR2BASE(run);
@@ -2505,29 +2552,31 @@
/* Try to coalesce forward. */
key.addr = (void *)((uintptr_t)run + size);
- nodeC = RB_NFIND(extent_tree_ad_s, &arena->runs_avail_ad, &key);
+ rb_nsearch(extent_node_t, link_ad, extent_ad_comp,
+ &arena->runs_avail_ad, &key, nodeC);
if (nodeC != NULL && nodeC->addr == key.addr) {
/*
* Coalesce forward. This does not change the position within
* runs_avail_ad, so only remove/insert from/into
* runs_avail_szad.
*/
- RB_REMOVE(extent_tree_szad_s, &arena->runs_avail_szad, nodeC);
+ extent_tree_szad_remove(&arena->runs_avail_szad, nodeC);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 06:47:28 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B21A81065678; Fri, 25 Apr 2008 06:47:27 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 7355D1065675
for <perforce@freebsd.org>; Fri, 25 Apr 2008 06:47:27 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 54D3B8FC14
for <perforce@freebsd.org>; Fri, 25 Apr 2008 06:47:27 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3P6lRoH089304
for <perforce@freebsd.org>; Fri, 25 Apr 2008 06:47:27 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3P6lR4s089302
for perforce@freebsd.org; Fri, 25 Apr 2008 06:47:27 GMT
(envelope-from jb@freebsd.org)
Date: Fri, 25 Apr 2008 06:47:27 GMT
Message-Id: <200804250647.m3P6lR4s089302@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140581 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 06:47:28 -0000
http://perforce.freebsd.org/chv.cgi?CH=140581
Change 140581 by jb@freebsd3 on 2008/04/25 06:47:18
IF7
Affected files ...
.. //depot/projects/dtrace7/src/gnu/usr.bin/send-pr/categories#2 integrate
.. //depot/projects/dtrace7/src/gnu/usr.bin/send-pr/send-pr.1#2 integrate
.. //depot/projects/dtrace7/src/sbin/gpt/gpt.c#4 integrate
.. //depot/projects/dtrace7/src/sbin/ifconfig/ifconfig.8#3 integrate
.. //depot/projects/dtrace7/src/share/man/man4/textdump.4#2 integrate
.. //depot/projects/dtrace7/src/sys/amd64/amd64/vm_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/arm/vm_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/ehci_pci.c#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/uhci_pci.c#3 integrate
.. //depot/projects/dtrace7/src/sys/i386/i386/vm_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/machdep.c#5 integrate
.. //depot/projects/dtrace7/src/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/kern/kern_thread.c#6 integrate
.. //depot/projects/dtrace7/src/sys/net80211/ieee80211_radiotap.h#2 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_xl.c#3 integrate
.. //depot/projects/dtrace7/src/sys/pci/if_xlreg.h#2 integrate
.. //depot/projects/dtrace7/src/sys/powerpc/powerpc/vm_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/include/bus.h#2 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/sparc64/bus_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sun4v/sun4v/vm_machdep.c#2 integrate
.. //depot/projects/dtrace7/src/sys/sys/proc.h#7 integrate
.. //depot/projects/dtrace7/src/tools/tools/ath/athstats/Makefile#2 integrate
.. //depot/projects/dtrace7/src/tools/tools/ath/athstats/athstats.c#2 integrate
.. //depot/projects/dtrace7/src/tools/tools/ath/athstats/statfoo.c#2 integrate
.. //depot/projects/dtrace7/src/usr.bin/procstat/procstat.1#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/adduser/adduser.8#3 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/info/main.c#3 integrate
.. //depot/projects/dtrace7/src/usr.sbin/pkg_install/info/perform.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/Makefile#3 integrate
Differences ...
==== //depot/projects/dtrace7/src/gnu/usr.bin/send-pr/categories#2 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.18 2006/07/17 10:36:56 ceri Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.18.2.1 2008/04/23 04:00:23 linimon Exp $
advocacy
alpha
amd64
+arm
bin
conf
docs
==== //depot/projects/dtrace7/src/gnu/usr.bin/send-pr/send-pr.1#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\"
.\" ---------------------------------------------------------------------------
.\"
-.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.20 2006/10/15 11:50:11 ceri Exp $
+.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.20.2.1 2008/04/23 04:00:23 linimon Exp $
.nh
.TH SEND-PR 1 3.113 "October 2006"
.SH NAME
@@ -191,6 +191,9 @@
.B amd64
AMD64 processor specific problems.
.TP
+.B arm
+ARM processor specific problems.
+.TP
.B bin
Corrections or enhancements to system executables.
.TP
==== //depot/projects/dtrace7/src/sbin/gpt/gpt.c#4 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16.2.3 2008/02/12 19:22:58 jhb Exp $");
+__FBSDID("$FreeBSD: src/sbin/gpt/gpt.c,v 1.16.2.4 2008/04/23 18:48:36 jhb Exp $");
#include <sys/param.h>
#include <sys/types.h>
@@ -317,6 +317,13 @@
return (0);
}
break;
+ case 'z':
+ if (strcmp(s, "zfs") == 0) {
+ uuid_t zfs = GPT_ENT_TYPE_FREEBSD_ZFS;
+ *uuid = zfs;
+ return (0);
+ }
+ break;
}
return (EINVAL);
}
==== //depot/projects/dtrace7/src/sbin/ifconfig/ifconfig.8#3 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.142.2.3 2008/04/10 04:01:26 thompsa Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.142.2.4 2008/04/25 05:33:16 sam Exp $
.\"
-.Dd December 8, 2007
+.Dd February 29, 2008
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -779,6 +779,8 @@
.It Cm deftxkey Ar index
Set the default key to use for transmission.
Typically this is only set when using WEP encryption.
+Note that you must set a default transmit key
+for the system to know which key to use in encrypting outbound traffic.
The
.Cm weptxkey
is an alias for this request; it is provided for backwards compatibility.
@@ -1263,6 +1265,10 @@
If that is the case, then the first four keys
(1-4) will be the standard temporary keys and any others will be adaptor
specific keys such as permanent keys stored in NVRAM.
+.Pp
+Note that you must set a default transmit key with
+.Cm deftxkey
+for the system to know which key to use in encrypting outbound traffic.
.It Cm wme
Enable Wireless Multimedia Extensions (WME) support, if available,
for the specified interface.
==== //depot/projects/dtrace7/src/share/man/man4/textdump.4#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/share/man/man4/textdump.4,v 1.3.2.2 2008/03/31 22:02:28 rwatson Exp $
+.\" $FreeBSD: src/share/man/man4/textdump.4,v 1.3.2.3 2008/04/24 06:32:16 rwatson Exp $
.\"
.Dd 26 December, 2007
.Dt textdump 4
@@ -48,7 +48,7 @@
By combining
.Nm
with other
-.Xr DDB 4
+.Xr ddb 4
facilities, such as scripting and output capture, detailed bug information
can be captured in a fully automated manner.
.Sh FORMAT
@@ -67,7 +67,7 @@
.Bl -tag -width version.txt
.It Pa ddb.txt
Captured
-.Xr DDB 4
+.Xr ddb 4
output, if the capture facility has been used.
May be disabled by clearing the
.Dv debug.ddb.textdump.do_ddb
@@ -110,7 +110,7 @@
dump will be regular memory dumps; however, by using the
.Ic textdump set
command in
-.Xr DDB 4 ,
+.Xr ddb 4 ,
or by setting the
.Dv debug.ddb.textdump.pending
sysctl to 1 using
@@ -118,7 +118,7 @@
it is possible to request that the next dump be a textdump.
.Pp
If at the
-.Xr DDB 4
+.Xr ddb 4
command line, the commands
.Ic textdump set ,
.Ic textdump status ,
==== //depot/projects/dtrace7/src/sys/amd64/amd64/vm_machdep.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.255 2007/06/04 23:57:29 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.255.2.1 2008/04/24 22:41:59 marcel Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
@@ -240,7 +240,7 @@
}
void
-cpu_thread_setup(struct thread *td)
+cpu_thread_alloc(struct thread *td)
{
td->td_pcb = (struct pcb *)(td->td_kstack +
@@ -248,6 +248,11 @@
td->td_frame = (struct trapframe *)td->td_pcb - 1;
}
+void
+cpu_thread_free(struct thread *td)
+{
+}
+
/*
* Initialize machine state (pcb and trap frame) for a new thread about to
* upcall. Put enough state in the new thread's PCB to get it to go back
==== //depot/projects/dtrace7/src/sys/arm/arm/vm_machdep.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.34 2007/09/15 18:47:01 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/vm_machdep.c,v 1.34.2.1 2008/04/24 22:42:00 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -333,7 +333,7 @@
}
void
-cpu_thread_setup(struct thread *td)
+cpu_thread_alloc(struct thread *td)
{
td->td_pcb = (struct pcb *)(td->td_kstack + td->td_kstack_pages *
PAGE_SIZE) - 1;
@@ -344,8 +344,13 @@
pmap_use_minicache(td->td_kstack, td->td_kstack_pages * PAGE_SIZE);
#endif
#endif
-
+}
+
+void
+cpu_thread_free(struct thread *td)
+{
}
+
void
cpu_thread_clean(struct thread *td)
{
==== //depot/projects/dtrace7/src/sys/dev/usb/ehci_pci.c#4 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.28.2.2 2008/03/19 16:38:55 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.28.2.3 2008/04/23 18:50:19 jhb Exp $");
/*
* USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
@@ -117,6 +117,10 @@
static const char *ehci_device_ich6 = "Intel 82801FB (ICH6) USB 2.0 controller";
#define PCI_EHCI_DEVICEID_ICH7 0x27cc8086
static const char *ehci_device_ich7 = "Intel 82801GB/R (ICH7) USB 2.0 controller";
+#define PCI_EHCI_DEVICEID_ICH8_A 0x28368086
+static const char *ehci_device_ich8_a = "Intel 82801H (ICH8) USB 2.0 controller USB2-A";
+#define PCI_EHCI_DEVICEID_ICH8_B 0x283a8086
+static const char *ehci_device_ich8_b = "Intel 82801H (ICH8) USB 2.0 controller USB2-B";
#define PCI_EHCI_DEVICEID_63XX 0x268c8086
static const char *ehci_device_63XX = "Intel 63XXESB USB 2.0 controller";
@@ -230,6 +234,10 @@
return (ehci_device_ich6);
case PCI_EHCI_DEVICEID_ICH7:
return (ehci_device_ich7);
+ case PCI_EHCI_DEVICEID_ICH8_A:
+ return (ehci_device_ich8_a);
+ case PCI_EHCI_DEVICEID_ICH8_B:
+ return (ehci_device_ich8_b);
case PCI_EHCI_DEVICEID_NEC:
return (ehci_device_nec);
case PCI_EHCI_DEVICEID_NF2:
==== //depot/projects/dtrace7/src/sys/dev/usb/uhci_pci.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.61.2.1 2007/11/26 18:21:42 jfv Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.61.2.2 2008/04/23 18:50:20 jhb Exp $");
/* Universal Host Controller Interface
*
@@ -151,6 +151,21 @@
#define PCI_UHCI_DEVICEID_63XXESB_4 0x268b8086
static const char *uhci_device_esb_4 = "Intel 631XESB/632XESB/3100 USB controller USB-4";
+#define PCI_UHCI_DEVICEID_ICH8_A 0x28308086
+static const char *uhci_device_ich8_a = "Intel 82801H (ICH8) USB controller USB-A";
+
+#define PCI_UHCI_DEVICEID_ICH8_B 0x28318086
+static const char *uhci_device_ich8_b = "Intel 82801H (ICH8) USB controller USB-B";
+
+#define PCI_UHCI_DEVICEID_ICH8_C 0x28328086
+static const char *uhci_device_ich8_c = "Intel 82801H (ICH8) USB controller USB-C";
+
+#define PCI_UHCI_DEVICEID_ICH8_D 0x28348086
+static const char *uhci_device_ich8_d = "Intel 82801H (ICH8) USB controller USB-D";
+
+#define PCI_UHCI_DEVICEID_ICH8_E 0x28358086
+static const char *uhci_device_ich8_e = "Intel 82801H (ICH8) USB controller USB-E";
+
#define PCI_UHCI_DEVICEID_440MX 0x719a8086
static const char *uhci_device_440mx = "Intel 82443MX USB controller";
@@ -250,6 +265,16 @@
return (uhci_device_esb_3);
} else if (device_id == PCI_UHCI_DEVICEID_63XXESB_4) {
return (uhci_device_esb_4);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_A) {
+ return (uhci_device_ich8_a);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_B) {
+ return (uhci_device_ich8_b);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_C) {
+ return (uhci_device_ich8_c);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_D) {
+ return (uhci_device_ich8_d);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_E) {
+ return (uhci_device_ich8_e);
} else if (device_id == PCI_UHCI_DEVICEID_440MX) {
return (uhci_device_440mx);
} else if (device_id == PCI_UHCI_DEVICEID_460GX) {
==== //depot/projects/dtrace7/src/sys/i386/i386/vm_machdep.c#2 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.283 2007/07/07 16:59:01 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/i386/vm_machdep.c,v 1.283.2.1 2008/04/24 22:42:00 marcel Exp $");
#include "opt_isa.h"
#include "opt_npx.h"
@@ -361,7 +361,7 @@
}
void
-cpu_thread_setup(struct thread *td)
+cpu_thread_alloc(struct thread *td)
{
td->td_pcb = (struct pcb *)(td->td_kstack +
@@ -370,6 +370,13 @@
td->td_pcb->pcb_ext = NULL;
}
+void
+cpu_thread_free(struct thread *td)
+{
+
+ cpu_thread_clean(td);
+}
+
/*
* Initialize machine state (pcb and trap frame) for a new thread about to
* upcall. Put enough state in the new thread's PCB to get it to go back
==== //depot/projects/dtrace7/src/sys/ia64/ia64/machdep.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.225.2.3 2008/03/30 09:19:07 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ia64/ia64/machdep.c,v 1.225.2.4 2008/04/24 22:42:00 marcel Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -812,7 +812,7 @@
* and make proc0's trapframe pointer point to it for sanity.
* Initialise proc0's backing store to start after u area.
*/
- cpu_thread_setup(&thread0);
+ cpu_thread_alloc(&thread0);
thread0.td_frame->tf_flags = FRAME_SYSCALL;
thread0.td_pcb->pcb_special.sp =
(u_int64_t)thread0.td_frame - 16;
==== //depot/projects/dtrace7/src/sys/ia64/ia64/vm_machdep.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.94 2007/06/04 23:57:31 jeff Exp $
+ * $FreeBSD: src/sys/ia64/ia64/vm_machdep.c,v 1.94.2.1 2008/04/24 22:42:00 marcel Exp $
*/
/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -107,7 +107,7 @@
}
void
-cpu_thread_setup(struct thread *td)
+cpu_thread_alloc(struct thread *td)
{
intptr_t sp;
@@ -121,6 +121,13 @@
}
void
+cpu_thread_free(struct thread *td)
+{
+
+ mtx_destroy(&td->td_md.md_highfp_mtx);
+}
+
+void
cpu_thread_swapin(struct thread *td)
{
}
==== //depot/projects/dtrace7/src/sys/kern/kern_thread.c#6 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.255.2.3 2008/04/11 08:47:35 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_thread.c,v 1.255.2.4 2008/04/24 22:42:00 marcel Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -329,7 +329,7 @@
uma_zfree(thread_zone, td);
return (NULL);
}
- cpu_thread_setup(td);
+ cpu_thread_alloc(td);
return (td);
}
@@ -341,7 +341,7 @@
thread_free(struct thread *td)
{
- cpu_thread_clean(td);
+ cpu_thread_free(td);
if (td->td_altkstack != 0)
vm_thread_dispose_altkstack(td);
if (td->td_kstack != 0)
==== //depot/projects/dtrace7/src/sys/net80211/ieee80211_radiotap.h#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.10 2007/07/01 06:59:30 thompsa Exp $ */
+/* $FreeBSD: src/sys/net80211/ieee80211_radiotap.h,v 1.10.2.1 2008/04/25 05:28:47 sam Exp $ */
/* $NetBSD: ieee80211_radiotap.h,v 1.16 2007/01/06 05:51:15 dyoung Exp $ */
/*-
@@ -194,22 +194,19 @@
};
#ifndef _KERNEL
-/* Channel flags. */
-#define IEEE80211_CHAN_TURBO 0x00010 /* Turbo channel */
-#define IEEE80211_CHAN_CCK 0x00020 /* CCK channel */
-#define IEEE80211_CHAN_OFDM 0x00040 /* OFDM channel */
-#define IEEE80211_CHAN_2GHZ 0x00080 /* 2 GHz spectrum channel. */
-#define IEEE80211_CHAN_5GHZ 0x00100 /* 5 GHz spectrum channel */
-#define IEEE80211_CHAN_PASSIVE 0x00200 /* Only passive scan allowed */
-#define IEEE80211_CHAN_DYN 0x00400 /* Dynamic CCK-OFDM channel */
-#define IEEE80211_CHAN_GFSK 0x00800 /* GFSK channel (FHSS PHY) */
-#define IEEE80211_CHAN_GSM 0x01000 /* 900 MHz spectrum channel */
-#define IEEE80211_CHAN_STURBO 0x02000 /* 11a static turbo channel only */
-#define IEEE80211_CHAN_HALF 0x04000 /* Half rate channel */
-#define IEEE80211_CHAN_QUARTER 0x08000 /* Quarter rate channel */
-#define IEEE80211_CHAN_HT20 0x10000 /* HT 20 channel */
-#define IEEE80211_CHAN_HT40U 0x20000 /* HT 40 channel w/ ext above */
-#define IEEE80211_CHAN_HT40D 0x40000 /* HT 40 channel w/ ext below */
+/* channel attributes */
+#define IEEE80211_CHAN_TURBO 0x00000010 /* Turbo channel */
+#define IEEE80211_CHAN_CCK 0x00000020 /* CCK channel */
+#define IEEE80211_CHAN_OFDM 0x00000040 /* OFDM channel */
+#define IEEE80211_CHAN_2GHZ 0x00000080 /* 2 GHz spectrum channel. */
+#define IEEE80211_CHAN_5GHZ 0x00000100 /* 5 GHz spectrum channel */
+#define IEEE80211_CHAN_PASSIVE 0x00000200 /* Only passive scan allowed */
+#define IEEE80211_CHAN_DYN 0x00000400 /* Dynamic CCK-OFDM channel */
+#define IEEE80211_CHAN_GFSK 0x00000800 /* GFSK channel (FHSS PHY) */
+#define IEEE80211_CHAN_GSM 0x00001000 /* 900 MHz spectrum channel */
+#define IEEE80211_CHAN_STURBO 0x00002000 /* 11a static turbo channel only */
+#define IEEE80211_CHAN_HALF 0x00004000 /* Half rate channel */
+#define IEEE80211_CHAN_QUARTER 0x00008000 /* Quarter rate channel */
#endif /* !_KERNEL */
/* For IEEE80211_RADIOTAP_FLAGS */
==== //depot/projects/dtrace7/src/sys/pci/if_xl.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.210.2.1 2008/03/13 07:50:48 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/pci/if_xl.c,v 1.210.2.2 2008/04/23 21:28:29 marius Exp $");
/*
* 3Com 3c90x Etherlink XL PCI NIC driver
@@ -163,7 +163,7 @@
/*
* Various supported device vendors/types and their names.
*/
-static struct xl_type xl_devs[] = {
+static const struct xl_type xl_devs[] = {
{ TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT,
"3Com 3c900-TPO Etherlink XL" },
{ TC_VENDORID, TC_DEVICEID_BOOMERANG_10BT_COMBO,
@@ -230,7 +230,7 @@
static int xl_newbuf(struct xl_softc *, struct xl_chain_onefrag *);
static void xl_stats_update(void *);
static void xl_stats_update_locked(struct xl_softc *);
-static int xl_encap(struct xl_softc *, struct xl_chain *, struct mbuf *);
+static int xl_encap(struct xl_softc *, struct xl_chain *, struct mbuf **);
static void xl_rxeof(struct xl_softc *);
static void xl_rxeof_task(void *, int);
static int xl_rx_resync(struct xl_softc *);
@@ -278,8 +278,6 @@
static void xl_choose_media(struct xl_softc *sc, int *media);
static void xl_choose_xcvr(struct xl_softc *, int);
static void xl_dma_map_addr(void *, bus_dma_segment_t *, int, int);
-static void xl_dma_map_rxbuf(void *, bus_dma_segment_t *, int, bus_size_t, int);
-static void xl_dma_map_txbuf(void *, bus_dma_segment_t *, int, bus_size_t, int);
#ifdef notdef
static void xl_testpacket(struct xl_softc *);
#endif
@@ -332,46 +330,6 @@
*paddr = segs->ds_addr;
}
-static void
-xl_dma_map_rxbuf(void *arg, bus_dma_segment_t *segs, int nseg,
- bus_size_t mapsize, int error)
-{
- u_int32_t *paddr;
-
- if (error)
- return;
-
- KASSERT(nseg == 1, ("xl_dma_map_rxbuf: too many DMA segments"));
- paddr = arg;
- *paddr = segs->ds_addr;
-}
-
-static void
-xl_dma_map_txbuf(void *arg, bus_dma_segment_t *segs, int nseg,
- bus_size_t mapsize, int error)
-{
- struct xl_list *l;
- int i, total_len;
-
- if (error)
- return;
-
- KASSERT(nseg <= XL_MAXFRAGS, ("too many DMA segments"));
-
- total_len = 0;
- l = arg;
- for (i = 0; i < nseg; i++) {
- KASSERT(segs[i].ds_len <= MCLBYTES, ("segment size too large"));
- l->xl_frag[i].xl_addr = htole32(segs[i].ds_addr);
- l->xl_frag[i].xl_len = htole32(segs[i].ds_len);
- total_len += segs[i].ds_len;
- }
- l->xl_frag[nseg - 1].xl_len = htole32(segs[nseg - 1].ds_len |
- XL_LAST_FRAG);
- l->xl_status = htole32(total_len);
- l->xl_next = 0;
-}
-
/*
* Murphy's law says that it's possible the chip can wedge and
* the 'command in progress' bit may never clear. Hence, we wait
@@ -1052,7 +1010,7 @@
static int
xl_probe(device_t dev)
{
- struct xl_type *t;
+ const struct xl_type *t;
t = xl_devs;
@@ -1226,7 +1184,7 @@
sc = device_get_softc(dev);
sc->xl_dev = dev;
-
+
unit = device_get_unit(dev);
mtx_init(&sc->xl_mtx, device_get_nameunit(dev), MTX_NETWORK_LOCK,
@@ -1890,8 +1848,8 @@
{
struct mbuf *m_new = NULL;
bus_dmamap_t map;
- int error;
- u_int32_t baddr;
+ bus_dma_segment_t segs[1];
+ int error, nseg;
XL_LOCK_ASSERT(sc);
@@ -1904,14 +1862,16 @@
/* Force longword alignment for packet payload. */
m_adj(m_new, ETHER_ALIGN);
- error = bus_dmamap_load_mbuf(sc->xl_mtag, sc->xl_tmpmap, m_new,
- xl_dma_map_rxbuf, &baddr, BUS_DMA_NOWAIT);
+ error = bus_dmamap_load_mbuf_sg(sc->xl_mtag, sc->xl_tmpmap, m_new,
+ segs, &nseg, BUS_DMA_NOWAIT);
if (error) {
m_freem(m_new);
device_printf(sc->xl_dev, "can't map mbuf (error %d)\n",
error);
return (error);
}
+ KASSERT(nseg == 1,
+ ("%s: too many DMA segments (%d)", __func__, nseg));
bus_dmamap_unload(sc->xl_mtag, c->xl_map);
map = c->xl_map;
@@ -1920,7 +1880,7 @@
c->xl_mbuf = m_new;
c->xl_ptr->xl_frag.xl_len = htole32(m_new->m_len | XL_LAST_FRAG);
c->xl_ptr->xl_status = 0;
- c->xl_ptr->xl_frag.xl_addr = htole32(baddr);
+ c->xl_ptr->xl_frag.xl_addr = htole32(segs->ds_addr);
bus_dmamap_sync(sc->xl_mtag, c->xl_map, BUS_DMASYNC_PREREAD);
return (0);
}
@@ -2174,7 +2134,6 @@
BUS_DMASYNC_POSTREAD);
idx = sc->xl_cdata.xl_tx_cons;
while (idx != sc->xl_cdata.xl_tx_prod) {
-
cur_tx = &sc->xl_cdata.xl_tx_chain[idx];
if (!(le32toh(cur_tx->xl_ptr->xl_status) &
@@ -2465,26 +2424,21 @@
* pointers to the fragment pointers.
*/
static int
-xl_encap(struct xl_softc *sc, struct xl_chain *c, struct mbuf *m_head)
+xl_encap(struct xl_softc *sc, struct xl_chain *c, struct mbuf **m_head)
{
- int error;
+ struct mbuf *m_new;
+ struct ifnet *ifp = sc->xl_ifp;
+ int error, i, nseg, total_len;
u_int32_t status;
- struct ifnet *ifp = sc->xl_ifp;
XL_LOCK_ASSERT(sc);
- /*
- * Start packing the mbufs in this chain into
- * the fragment pointers. Stop when we run out
- * of fragments or hit the end of the mbuf chain.
- */
- error = bus_dmamap_load_mbuf(sc->xl_mtag, c->xl_map, m_head,
- xl_dma_map_txbuf, c->xl_ptr, BUS_DMA_NOWAIT);
+ error = bus_dmamap_load_mbuf_sg(sc->xl_mtag, c->xl_map, *m_head,
+ sc->xl_cdata.xl_tx_segs, &nseg, BUS_DMA_NOWAIT);
if (error && error != EFBIG) {
- m_freem(m_head);
if_printf(ifp, "can't map mbuf (error %d)\n", error);
- return (1);
+ return (error);
}
/*
@@ -2496,25 +2450,47 @@
* and would waste cycles.
*/
if (error) {
- struct mbuf *m_new;
-
- m_new = m_defrag(m_head, M_DONTWAIT);
+ m_new = m_collapse(*m_head, M_DONTWAIT, XL_MAXFRAGS);
if (m_new == NULL) {
- m_freem(m_head);
- return (1);
- } else {
- m_head = m_new;
+ m_freem(*m_head);
+ *m_head = NULL;
+ return (ENOBUFS);
}
+ *m_head = m_new;
- error = bus_dmamap_load_mbuf(sc->xl_mtag, c->xl_map,
- m_head, xl_dma_map_txbuf, c->xl_ptr, BUS_DMA_NOWAIT);
+ error = bus_dmamap_load_mbuf_sg(sc->xl_mtag, c->xl_map,
+ *m_head, sc->xl_cdata.xl_tx_segs, &nseg, BUS_DMA_NOWAIT);
if (error) {
- m_freem(m_head);
+ m_freem(*m_head);
+ *m_head = NULL;
if_printf(ifp, "can't map mbuf (error %d)\n", error);
- return (1);
+ return (error);
}
}
+ KASSERT(nseg <= XL_MAXFRAGS,
+ ("%s: too many DMA segments (%d)", __func__, nseg));
+ if (nseg == 0) {
+ m_freem(*m_head);
+ *m_head = NULL;
+ return (EIO);
+ }
+
+ total_len = 0;
+ for (i = 0; i < nseg; i++) {
+ KASSERT(sc->xl_cdata.xl_tx_segs[i].ds_len <= MCLBYTES,
+ ("segment size too large"));
+ c->xl_ptr->xl_frag[i].xl_addr =
+ htole32(sc->xl_cdata.xl_tx_segs[i].ds_addr);
+ c->xl_ptr->xl_frag[i].xl_len =
+ htole32(sc->xl_cdata.xl_tx_segs[i].ds_len);
+ total_len += sc->xl_cdata.xl_tx_segs[i].ds_len;
+ }
+ c->xl_ptr->xl_frag[nseg - 1].xl_len =
+ htole32(sc->xl_cdata.xl_tx_segs[nseg - 1].ds_len | XL_LAST_FRAG);
+ c->xl_ptr->xl_status = htole32(total_len);
+ c->xl_ptr->xl_next = 0;
+
if (sc->xl_type == XL_TYPE_905B) {
status = XL_TXSTAT_RND_DEFEAT;
@@ -2531,7 +2507,7 @@
c->xl_ptr->xl_status = htole32(status);
}
- c->xl_mbuf = m_head;
+ c->xl_mbuf = *m_head;
bus_dmamap_sync(sc->xl_mtag, c->xl_map, BUS_DMASYNC_PREWRITE);
return (0);
}
@@ -2564,7 +2540,6 @@
struct xl_softc *sc = ifp->if_softc;
struct mbuf *m_head = NULL;
struct xl_chain *prev = NULL, *cur_tx = NULL, *start_tx;
- struct xl_chain *prev_tx;
u_int32_t status;
int error;
@@ -2585,20 +2560,23 @@
start_tx = sc->xl_cdata.xl_tx_free;
- while (sc->xl_cdata.xl_tx_free != NULL) {
+ for (; !IFQ_DRV_IS_EMPTY(&ifp->if_snd) &&
+ sc->xl_cdata.xl_tx_free != NULL;) {
IFQ_DRV_DEQUEUE(&ifp->if_snd, m_head);
if (m_head == NULL)
break;
/* Pick a descriptor off the free list. */
- prev_tx = cur_tx;
cur_tx = sc->xl_cdata.xl_tx_free;
/* Pack the data into the descriptor. */
- error = xl_encap(sc, cur_tx, m_head);
+ error = xl_encap(sc, cur_tx, &m_head);
if (error) {
- cur_tx = prev_tx;
- continue;
+ if (m_head == NULL)
+ break;
+ ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+ IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
+ break;
}
sc->xl_cdata.xl_tx_free = cur_tx->xl_next;
@@ -2628,7 +2606,7 @@
* Place the request for the upload interrupt
* in the last descriptor in the chain. This way, if
* we're chaining several packets at once, we'll only
- * get an interupt once for the whole chain rather than
+ * get an interrupt once for the whole chain rather than
* once for each packet.
*/
cur_tx->xl_ptr->xl_status = htole32(le32toh(cur_tx->xl_ptr->xl_status) |
@@ -2691,7 +2669,6 @@
struct xl_softc *sc = ifp->if_softc;
struct mbuf *m_head = NULL;
struct xl_chain *prev = NULL, *cur_tx = NULL, *start_tx;
- struct xl_chain *prev_tx;
int error, idx;
XL_LOCK_ASSERT(sc);
@@ -2702,8 +2679,8 @@
idx = sc->xl_cdata.xl_tx_prod;
start_tx = &sc->xl_cdata.xl_tx_chain[idx];
- while (sc->xl_cdata.xl_tx_chain[idx].xl_mbuf == NULL) {
-
+ for (; !IFQ_DRV_IS_EMPTY(&ifp->if_snd) &&
+ sc->xl_cdata.xl_tx_chain[idx].xl_mbuf == NULL;) {
if ((XL_TX_LIST_CNT - sc->xl_cdata.xl_tx_cnt) < 3) {
ifp->if_drv_flags |= IFF_DRV_OACTIVE;
break;
@@ -2713,14 +2690,16 @@
if (m_head == NULL)
break;
- prev_tx = cur_tx;
cur_tx = &sc->xl_cdata.xl_tx_chain[idx];
/* Pack the data into the descriptor. */
- error = xl_encap(sc, cur_tx, m_head);
+ error = xl_encap(sc, cur_tx, &m_head);
if (error) {
- cur_tx = prev_tx;
- continue;
+ if (m_head == NULL)
+ break;
+ ifp->if_drv_flags |= IFF_DRV_OACTIVE;
+ IFQ_DRV_PREPEND(&ifp->if_snd, m_head);
+ break;
}
/* Chain it together. */
@@ -2748,7 +2727,7 @@
* Place the request for the upload interrupt
* in the last descriptor in the chain. This way, if
* we're chaining several packets at once, we'll only
- * get an interupt once for the whole chain rather than
+ * get an interrupt once for the whole chain rather than
* once for each packet.
*/
cur_tx->xl_ptr->xl_status = htole32(le32toh(cur_tx->xl_ptr->xl_status) |
@@ -3027,10 +3006,8 @@
case IFM_10_2:
case IFM_10_5:
xl_setmode(sc, ifm->ifm_media);
+ XL_UNLOCK(sc);
return (0);
- break;
- default:
- break;
}
if (sc->xl_media & XL_MEDIAOPT_MII ||
@@ -3198,7 +3175,6 @@
ifp->if_capenable |= IFCAP_POLLING;
XL_UNLOCK(sc);
return (error);
-
}
if (!(ifr->ifr_reqcap & IFCAP_POLLING) &&
ifp->if_capenable & IFCAP_POLLING) {
==== //depot/projects/dtrace7/src/sys/pci/if_xlreg.h#2 (text+ko) ====
@@ -29,7 +29,7 @@
* ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
* THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/pci/if_xlreg.h,v 1.59 2006/12/06 02:18:41 marius Exp $
+ * $FreeBSD: src/sys/pci/if_xlreg.h,v 1.59.2.1 2008/04/23 21:28:29 marius Exp $
*/
#define XL_EE_READ 0x0080 /* read, 5 bit address */
@@ -486,6 +486,7 @@
struct xl_chain_data {
struct xl_chain_onefrag xl_rx_chain[XL_RX_LIST_CNT];
struct xl_chain xl_tx_chain[XL_TX_LIST_CNT];
+ bus_dma_segment_t xl_tx_segs[XL_MAXFRAGS];
struct xl_chain_onefrag *xl_rx_head;
@@ -589,7 +590,7 @@
struct resource *xl_irq;
struct resource *xl_res;
device_t xl_miibus;
- struct xl_type *xl_info; /* 3Com adapter info */
+ const struct xl_type *xl_info; /* 3Com adapter info */
bus_dma_tag_t xl_mtag;
bus_dmamap_t xl_tmpmap; /* spare DMA map */
u_int8_t xl_unit; /* interface number */
==== //depot/projects/dtrace7/src/sys/powerpc/powerpc/vm_machdep.c#2 (text+ko) ====
@@ -38,7 +38,7 @@
*
* from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91
* Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$
- * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.115 2007/06/06 06:01:56 grehan Exp $
+ * $FreeBSD: src/sys/powerpc/powerpc/vm_machdep.c,v 1.115.2.1 2008/04/24 22:42:00 marcel Exp $
*/
/*-
* Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University.
@@ -277,7 +277,7 @@
}
void
-cpu_thread_setup(struct thread *td)
+cpu_thread_alloc(struct thread *td)
{
struct pcb *pcb;
@@ -288,6 +288,11 @@
}
void
+cpu_thread_free(struct thread *td)
+{
+}
+
+void
cpu_thread_swapin(struct thread *td)
{
}
==== //depot/projects/dtrace7/src/sys/sparc64/include/bus.h#2 (text+ko) ====
@@ -69,7 +69,7 @@
* and
* from: FreeBSD: src/sys/alpha/include/bus.h,v 1.9 2001/01/09
*
- * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.41 2007/01/18 18:32:25 marius Exp $
+ * $FreeBSD: src/sys/sparc64/include/bus.h,v 1.41.2.1 2008/04/23 21:25:16 marius Exp $
*/
#ifndef _MACHINE_BUS_H_
@@ -96,8 +96,8 @@
#define PCI_MEMORY_BUS_SPACE 4
#define LAST_BUS_SPACE 5
-extern int bus_type_asi[];
-extern int bus_stream_asi[];
+extern const int bus_type_asi[];
+extern const int bus_stream_asi[];
#define __BUS_SPACE_HAS_STREAM_METHODS 1
==== //depot/projects/dtrace7/src/sys/sparc64/sparc64/bus_machdep.c#2 (text+ko) ====
@@ -95,11 +95,11 @@
* from: @(#)machdep.c 8.6 (Berkeley) 1/14/94
* from: NetBSD: machdep.c,v 1.111 2001/09/15 07:13:40 eeh Exp
* and
- * from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15
+ * from: FreeBSD: src/sys/i386/i386/busdma_machdep.c,v 1.24 2001/08/15
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/bus_machdep.c,v 1.46 2007/05/29 06:30:26 yongari Exp $");
+__FBSDID("$FreeBSD: src/sys/sparc64/sparc64/bus_machdep.c,v 1.46.2.1 2008/04/23 21:25:16 marius Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -130,8 +130,8 @@
static void nexus_bus_barrier(bus_space_tag_t, bus_space_handle_t,
bus_size_t, bus_size_t, int);
-/* ASI's for bus access. */
-int bus_type_asi[] = {
+/* ASIs for bus access */
+const int bus_type_asi[] = {
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* nexus */
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* SBus */
ASI_PHYS_BYPASS_EC_WITH_EBIT_L, /* PCI configuration space */
@@ -140,7 +140,7 @@
0
};
-int bus_stream_asi[] = {
+const int bus_stream_asi[] = {
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* nexus */
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* SBus */
ASI_PHYS_BYPASS_EC_WITH_EBIT, /* PCI configuration space */
@@ -244,7 +244,7 @@
newtag->dt_segments = NULL;
- /* Take into account any restrictions imposed by our parent tag */
+ /* Take into account any restrictions imposed by our parent tag. */
newtag->dt_lowaddr = ulmin(parent->dt_lowaddr, newtag->dt_lowaddr);
newtag->dt_highaddr = ulmax(parent->dt_highaddr, newtag->dt_highaddr);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 07:19:00 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0B70D1065674; Fri, 25 Apr 2008 07:19:00 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C11181065672
for <perforce@freebsd.org>; Fri, 25 Apr 2008 07:18:59 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id A0DE48FC18
for <perforce@freebsd.org>; Fri, 25 Apr 2008 07:18:59 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3P7IxVu091437
for <perforce@freebsd.org>; Fri, 25 Apr 2008 07:18:59 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3P7IxiN091435
for perforce@freebsd.org; Fri, 25 Apr 2008 07:18:59 GMT
(envelope-from jb@freebsd.org)
Date: Fri, 25 Apr 2008 07:18:59 GMT
Message-Id: <200804250718.m3P7IxiN091435@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140582 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 07:19:00 -0000
http://perforce.freebsd.org/chv.cgi?CH=140582
Change 140582 by jb@freebsd3 on 2008/04/25 07:18:51
IF6
Affected files ...
.. //depot/projects/dtrace6/src/gnu/usr.bin/send-pr/categories#2 integrate
.. //depot/projects/dtrace6/src/gnu/usr.bin/send-pr/send-pr.1#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/gen/Makefile.inc#3 integrate
.. //depot/projects/dtrace6/src/lib/libc/gen/__getosreldate.c#1 branch
.. //depot/projects/dtrace6/src/lib/libc/gen/lockf.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/include/libc_private.h#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/rpc/svc_vc.c#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/sys/Makefile.inc#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/sys/fcntl.2#2 integrate
.. //depot/projects/dtrace6/src/lib/libc/sys/fcntl.c#1 branch
.. //depot/projects/dtrace6/src/lib/libc/xdr/xdr_rec.c#2 integrate
.. //depot/projects/dtrace6/src/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/dtrace6/src/sys/arm/conf/AVILA#2 integrate
.. //depot/projects/dtrace6/src/sys/arm/conf/HL200#2 integrate
.. //depot/projects/dtrace6/src/sys/arm/conf/IQ31244#2 integrate
.. //depot/projects/dtrace6/src/sys/arm/conf/SIMICS#2 integrate
.. //depot/projects/dtrace6/src/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate
.. //depot/projects/dtrace6/src/sys/compat/freebsd32/syscalls.master#4 integrate
.. //depot/projects/dtrace6/src/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/dtrace6/src/sys/compat/svr4/svr4_fcntl.c#2 integrate
.. //depot/projects/dtrace6/src/sys/conf/NOTES#3 integrate
.. //depot/projects/dtrace6/src/sys/conf/files#5 integrate
.. //depot/projects/dtrace6/src/sys/conf/options#2 integrate
.. //depot/projects/dtrace6/src/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/dtrace6/src/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/msdosfs/msdosfs_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/dtrace6/src/sys/i386/conf/XBOX#2 integrate
.. //depot/projects/dtrace6/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 integrate
.. //depot/projects/dtrace6/src/sys/ia64/conf/GENERIC#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/init_sysent.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/dtrace6/src/sys/kern/kern_lockf.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/syscalls.c#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/syscalls.master#2 integrate
.. //depot/projects/dtrace6/src/sys/kern/vnode_if.src#3 integrate
.. //depot/projects/dtrace6/src/sys/modules/Makefile#5 integrate
.. //depot/projects/dtrace6/src/sys/modules/krpc/Makefile#1 branch
.. //depot/projects/dtrace6/src/sys/modules/nfslockd/Makefile#1 branch
.. //depot/projects/dtrace6/src/sys/nfs4client/nfs4_vnops.c#2 integrate
.. //depot/projects/dtrace6/src/sys/nfsclient/nfs_lock.c#2 integrate
.. //depot/projects/dtrace6/src/sys/nfsclient/nfs_vnops.c#3 integrate
.. //depot/projects/dtrace6/src/sys/nfsserver/nfs_srvsock.c#2 integrate
.. //depot/projects/dtrace6/src/sys/nlm/nlm.h#1 branch
.. //depot/projects/dtrace6/src/sys/nlm/nlm_prot.h#1 branch
.. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_clnt.c#1 branch
.. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_impl.c#1 branch
.. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_server.c#1 branch
.. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_svc.c#1 branch
.. //depot/projects/dtrace6/src/sys/nlm/nlm_prot_xdr.c#1 branch
.. //depot/projects/dtrace6/src/sys/nlm/sm_inter.h#1 branch
.. //depot/projects/dtrace6/src/sys/nlm/sm_inter_xdr.c#1 branch
.. //depot/projects/dtrace6/src/sys/pc98/conf/GENERIC#2 integrate
.. //depot/projects/dtrace6/src/sys/pci/if_xl.c#2 integrate
.. //depot/projects/dtrace6/src/sys/pci/if_xlreg.h#2 integrate
.. //depot/projects/dtrace6/src/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/dtrace6/src/sys/rpc/auth.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/auth_none.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/auth_unix.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/authunix_prot.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/clnt.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/clnt_dg.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/clnt_rc.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/clnt_stat.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/clnt_vc.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/getnetconfig.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/inet_ntop.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/inet_pton.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/netconfig.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/nettype.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/pmap_prot.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpc.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpc_callmsg.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpc_com.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpc_generic.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpc_msg.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpc_prot.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpcb_clnt.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpcb_clnt.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpcb_prot.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/rpcb_prot.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/svc.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/svc.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/svc_auth.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/svc_auth.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/svc_auth_unix.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/svc_dg.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/svc_generic.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/svc_vc.c#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/types.h#1 branch
.. //depot/projects/dtrace6/src/sys/rpc/xdr.h#1 branch
.. //depot/projects/dtrace6/src/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/dtrace6/src/sys/sys/fcntl.h#3 integrate
.. //depot/projects/dtrace6/src/sys/sys/hash.h#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/lockf.h#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/mbuf.h#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/param.h#7 integrate
.. //depot/projects/dtrace6/src/sys/sys/syscall.h#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/syscall.mk#2 integrate
.. //depot/projects/dtrace6/src/sys/sys/sysproto.h#2 integrate
.. //depot/projects/dtrace6/src/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/dtrace6/src/sys/xdr/xdr.c#1 branch
.. //depot/projects/dtrace6/src/sys/xdr/xdr_array.c#1 branch
.. //depot/projects/dtrace6/src/sys/xdr/xdr_mbuf.c#1 branch
.. //depot/projects/dtrace6/src/sys/xdr/xdr_mem.c#1 branch
.. //depot/projects/dtrace6/src/sys/xdr/xdr_reference.c#1 branch
.. //depot/projects/dtrace6/src/sys/xdr/xdr_sizeof.c#1 branch
.. //depot/projects/dtrace6/src/tools/regression/file/flock/Makefile#1 branch
.. //depot/projects/dtrace6/src/tools/regression/file/flock/flock.c#1 branch
.. //depot/projects/dtrace6/src/usr.sbin/Makefile#4 integrate
.. //depot/projects/dtrace6/src/usr.sbin/adduser/adduser.8#5 integrate
.. //depot/projects/dtrace6/src/usr.sbin/clear_locks/Makefile#1 branch
.. //depot/projects/dtrace6/src/usr.sbin/clear_locks/clear_locks.8#1 branch
.. //depot/projects/dtrace6/src/usr.sbin/clear_locks/clear_locks.c#1 branch
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/info/main.c#3 integrate
.. //depot/projects/dtrace6/src/usr.sbin/pkg_install/info/perform.c#3 integrate
.. //depot/projects/dtrace6/src/usr.sbin/rpc.lockd/lockd.c#2 integrate
.. //depot/projects/dtrace6/src/usr.sbin/rpc.statd/statd.c#2 integrate
Differences ...
==== //depot/projects/dtrace6/src/gnu/usr.bin/send-pr/categories#2 (text+ko) ====
@@ -1,7 +1,8 @@
-# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.17.2.1 2006/07/17 10:38:37 ceri Exp $
+# $FreeBSD: src/gnu/usr.bin/send-pr/categories,v 1.17.2.2 2008/04/23 04:01:53 linimon Exp $
advocacy
alpha
amd64
+arm
bin
conf
docs
==== //depot/projects/dtrace6/src/gnu/usr.bin/send-pr/send-pr.1#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\"
.\" ---------------------------------------------------------------------------
.\"
-.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.18.2.2 2006/10/23 20:59:26 ceri Exp $
+.\" $FreeBSD: src/gnu/usr.bin/send-pr/send-pr.1,v 1.18.2.3 2008/04/23 04:01:53 linimon Exp $
.nh
.TH SEND-PR 1 3.113 "October 2006"
.SH NAME
@@ -191,6 +191,9 @@
.B amd64
AMD64 processor specific problems.
.TP
+.B arm
+ARM processor specific problems.
+.TP
.B bin
Corrections or enhancements to system executables.
.TP
==== //depot/projects/dtrace6/src/lib/libc/gen/Makefile.inc#3 (text+ko) ====
@@ -1,10 +1,11 @@
# @(#)Makefile.inc 8.6 (Berkeley) 5/4/95
-# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.121.2.2 2007/10/06 03:15:15 scf Exp $
+# $FreeBSD: src/lib/libc/gen/Makefile.inc,v 1.121.2.3 2008/04/24 10:46:16 dfr Exp $
# machine-independent gen sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/gen ${.CURDIR}/gen
-SRCS+= __xuname.c _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \
+SRCS+= __getosreldate.c __xuname.c \
+ _pthread_stubs.c _rand48.c _spinlock_stub.c _thread_init.c \
alarm.c arc4random.c assert.c basename.c check_utility_compat.c \
clock.c closedir.c confstr.c \
crypt.c ctermid.c daemon.c devname.c dirname.c disklabel.c \
==== //depot/projects/dtrace6/src/lib/libc/gen/lockf.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
/* $NetBSD: lockf.c,v 1.1 1997/12/20 20:23:18 kleink Exp $ */
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/gen/lockf.c,v 1.8 2002/02/01 00:57:29 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/gen/lockf.c,v 1.8.14.1 2008/04/24 10:46:16 dfr Exp $");
#include "namespace.h"
#include <errno.h>
@@ -74,7 +74,7 @@
fl.l_type = F_WRLCK;
if (_fcntl(filedes, F_GETLK, &fl) == -1)
return (-1);
- if (fl.l_type == F_UNLCK || fl.l_pid == getpid())
+ if (fl.l_type == F_UNLCK || (fl.l_sysid == 0 && fl.l_pid == getpid()))
return (0);
errno = EAGAIN;
return (-1);
==== //depot/projects/dtrace6/src/lib/libc/include/libc_private.h#2 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.12 2004/08/15 16:18:03 dfr Exp $
+ * $FreeBSD: src/lib/libc/include/libc_private.h,v 1.12.8.1 2008/04/24 10:46:16 dfr Exp $
*
* Private definitions for libc, libc_r and libpthread.
*
@@ -135,4 +135,13 @@
*/
extern struct _spinlock *__malloc_lock;
+/*
+ * Get kern.osreldate to detect ABI revisions. Explicitly
+ * ignores value of $OSVERSION and caches result.
+ */
+extern int __getosreldate(void);
+
+/* Without back-compat translation */
+extern int __sys_fcntl(int, int, ...);
+
#endif /* _LIBC_PRIVATE_H_ */
==== //depot/projects/dtrace6/src/lib/libc/rpc/svc_vc.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
static char *sccsid = "@(#)svc_tcp.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_vc.c,v 1.24 2004/10/16 06:11:35 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/rpc/svc_vc.c,v 1.24.2.1 2008/04/24 10:46:16 dfr Exp $");
/*
* svc_vc.c, Server side for Connection Oriented based RPC.
@@ -602,10 +602,11 @@
if (cd->nonblock) {
if (!__xdrrec_getrec(xdrs, &cd->strm_stat, TRUE))
return FALSE;
+ } else {
+ (void)xdrrec_skiprecord(xdrs);
}
xdrs->x_op = XDR_DECODE;
- (void)xdrrec_skiprecord(xdrs);
if (xdr_callmsg(xdrs, msg)) {
cd->x_id = msg->rm_xid;
return (TRUE);
==== //depot/projects/dtrace6/src/lib/libc/sys/Makefile.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile.inc 8.3 (Berkeley) 10/24/94
-# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.113.2.2 2006/10/16 11:59:08 ru Exp $
+# $FreeBSD: src/lib/libc/sys/Makefile.inc,v 1.113.2.3 2008/04/24 10:46:16 dfr Exp $
# sys sources
.PATH: ${.CURDIR}/${MACHINE_ARCH}/sys ${.CURDIR}/sys
@@ -19,6 +19,10 @@
# Sources common to both syscall interfaces:
SRCS+= ftruncate.c lseek.c mmap.c pread.c pwrite.c truncate.c __error.c
+.if !defined(WITHOUT_SYSCALL_COMPAT)
+SRCS+= fcntl.c
+PSEUDO+= _fcntl.o
+.endif
# Add machine dependent asm sources:
SRCS+=${MDASM}
==== //depot/projects/dtrace6/src/lib/libc/sys/fcntl.2#2 (text+ko) ====
@@ -30,7 +30,7 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)fcntl.2 8.2 (Berkeley) 1/12/94
-.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.44 2004/07/02 23:52:13 ru Exp $
+.\" $FreeBSD: src/lib/libc/sys/fcntl.2,v 1.44.8.1 2008/04/24 10:46:16 dfr Exp $
.\"
.Dd January 12, 1994
.Dt FCNTL 2
@@ -181,6 +181,7 @@
pid_t l_pid; /* lock owner */
short l_type; /* lock type: read/write, etc. */
short l_whence; /* type of l_start */
+ int l_sysid; /* remote system id or zero for local */
};
.Ed
The commands available for advisory record locking are as follows:
@@ -268,9 +269,13 @@
means end edge of the region.
The
.Fa l_pid
-field is only used with
+and
+.Fa l_sysid
+fields are only used with
.Dv F_GETLK
-to return the process ID of the process holding a blocking lock.
+to return the process ID of the process holding a blocking lock and
+the system ID of the system that owns that process.
+Locks created by the local system will have a system ID of zero.
After a successful
.Dv F_GETLK
request, the value of
==== //depot/projects/dtrace6/src/lib/libc/xdr/xdr_rec.c#2 (text+ko) ====
@@ -34,7 +34,7 @@
static char *sccsid = "@(#)xdr_rec.c 2.2 88/08/01 4.0 RPCSRC";
#endif
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.21 2004/10/16 06:32:43 obrien Exp $");
+__FBSDID("$FreeBSD: src/lib/libc/xdr/xdr_rec.c,v 1.21.2.1 2008/04/24 10:46:17 dfr Exp $");
/*
* xdr_rec.c, Implements TCP/IP based XDR streams with a "record marking"
@@ -574,6 +574,12 @@
rstrm->in_header &= ~LAST_FRAG;
rstrm->last_frag = TRUE;
}
+ /*
+ * We can only reasonably expect to read once from a
+ * non-blocking stream. Reading the fragment header
+ * may have drained the stream.
+ */
+ expectdata = FALSE;
}
n = rstrm->readit(rstrm->tcp_handle,
==== //depot/projects/dtrace6/src/sys/amd64/conf/GENERIC#3 (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.439.2.19 2007/12/15 06:03:43 scottl Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.439.2.20 2008/04/24 10:46:17 dfr Exp $
machine amd64
cpu HAMMER
@@ -38,6 +38,7 @@
options MD_ROOT # MD is a potential root device
options NFSCLIENT # Network Filesystem Client
options NFSSERVER # Network Filesystem Server
+options NFSLOCKD # Network Lock Manager
options NFS_ROOT # NFS usable as /, requires NFSCLIENT
options NTFS # NT File System
options MSDOSFS # MSDOS Filesystem
==== //depot/projects/dtrace6/src/sys/arm/conf/AVILA#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/arm/conf/AVILA,v 1.3.2.2 2007/02/27 00:27:50 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/AVILA,v 1.3.2.3 2008/04/24 10:46:17 dfr Exp $
machine arm
ident AVILA
@@ -57,6 +57,7 @@
options UFS_DIRHASH #Improve performance on big directories
options NFSCLIENT #Network Filesystem Client
options NFSSERVER #Network Filesystem Server
+options NFSLOCKD #Network Lock Manager
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
#options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
==== //depot/projects/dtrace6/src/sys/arm/conf/HL200#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/arm/conf/HL200,v 1.2.4.1 2007/12/02 14:20:34 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/HL200,v 1.2.4.2 2008/04/24 10:46:17 dfr Exp $
machine arm
ident HL200
@@ -49,6 +49,7 @@
#options ROOTDEVNAME=\"ufs:md0\"
options NFSCLIENT #Network Filesystem Client
#options NFSSERVER #Network Filesystem Server
+#options NFSLOCKD #Network Lock Manager
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
options BOOTP_NFSROOT
options BOOTP
==== //depot/projects/dtrace6/src/sys/arm/conf/IQ31244#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.11.2.2 2007/02/27 00:27:50 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/IQ31244,v 1.11.2.3 2008/04/24 10:46:17 dfr Exp $
machine arm
ident IQ31244
@@ -46,6 +46,7 @@
options UFS_DIRHASH #Improve performance on big directories
options NFSCLIENT #Network Filesystem Client
options NFSSERVER #Network Filesystem Server
+options NFSLOCKD #Network Lock Manager
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
#options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
==== //depot/projects/dtrace6/src/sys/arm/conf/SIMICS#2 (text+ko) ====
@@ -15,7 +15,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.7.2.1 2006/06/23 16:56:57 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/SIMICS,v 1.7.2.2 2008/04/24 10:46:17 dfr Exp $
machine arm
ident SIMICS
@@ -43,6 +43,7 @@
options ROOTDEVNAME=\"ufs:md0\"
options NFSCLIENT #Network Filesystem Client
options NFSSERVER #Network Filesystem Server
+options NFSLOCKD #Network Lock Manager
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
#options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
==== //depot/projects/dtrace6/src/sys/arm/conf/SKYEYE#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/arm/conf/SKYEYE,v 1.5.2.1 2006/06/23 23:35:35 cognet Exp $
+# $FreeBSD: src/sys/arm/conf/SKYEYE,v 1.5.2.2 2008/04/24 10:46:17 dfr Exp $
machine arm
ident KB920X
@@ -47,6 +47,7 @@
options ROOTDEVNAME=\"ufs:md0\"
options NFSCLIENT #Network Filesystem Client
options NFSSERVER #Network Filesystem Server
+options NFSLOCKD #Network Lock Manager
options NFS_ROOT #NFS usable as /, requires NFSCLIENT
#options MSDOSFS #MSDOS Filesystem
options CD9660 #ISO 9660 Filesystem
==== //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_proto.h#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.38.2.15 2007/12/19 23:04:12 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_proto.h,v 1.38.2.16 2008/04/24 10:52:29 dfr Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp
*/
#ifndef _FREEBSD32_SYSPROTO_H_
==== //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscall.h#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.38.2.15 2007/12/19 23:04:12 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscall.h,v 1.38.2.16 2008/04/24 10:52:30 dfr Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp
*/
#define FREEBSD32_SYS_syscall 0
==== //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call names.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.29.2.15 2007/12/19 23:04:12 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_syscalls.c,v 1.29.2.16 2008/04/24 10:52:30 dfr Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp
*/
const char *freebsd32_syscallnames[] = {
@@ -161,7 +161,7 @@
"#151", /* 151 = sem_lock */
"#152", /* 152 = sem_wakeup */
"#153", /* 153 = asyncdaemon */
- "#154", /* 154 = nosys */
+ "#154", /* 154 = nlm_syscall */
"#155", /* 155 = nfssvc */
"obs_ogetdirentries", /* 156 = obsolete ogetdirentries */
"old.freebsd32_statfs", /* 157 = old freebsd32_statfs */
==== //depot/projects/dtrace6/src/sys/compat/freebsd32/freebsd32_sysent.c#4 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.39.2.15 2007/12/19 23:04:12 jhb Exp $
- * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp
+ * $FreeBSD: src/sys/compat/freebsd32/freebsd32_sysent.c,v 1.39.2.16 2008/04/24 10:52:30 dfr Exp $
+ * created from FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp
*/
#include "opt_compat.h"
@@ -187,7 +187,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = sem_lock */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = sem_wakeup */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */
- { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */
+ { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nlm_syscall */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 156 = obsolete ogetdirentries */
{ compat4(SYF_MPSAFE | AS(freebsd4_freebsd32_statfs_args),freebsd32_statfs), AUE_STATFS }, /* 157 = old freebsd32_statfs */
==== //depot/projects/dtrace6/src/sys/compat/freebsd32/syscalls.master#4 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.15 2007/12/19 23:03:50 jhb Exp $
+ $FreeBSD: src/sys/compat/freebsd32/syscalls.master,v 1.50.2.16 2008/04/24 10:46:17 dfr Exp $
; from: @(#)syscalls.master 8.2 (Berkeley) 1/13/94
; from: src/sys/kern/syscalls.master 1.107
;
@@ -279,7 +279,8 @@
151 AUE_NULL UNIMPL sem_lock (BSD/OS 2.x)
152 AUE_NULL UNIMPL sem_wakeup (BSD/OS 2.x)
153 AUE_NULL UNIMPL asyncdaemon (BSD/OS 2.x)
-154 AUE_NULL UNIMPL nosys
+; 154 is initialised by the NLM code, if present.
+154 AUE_NULL UNIMPL nlm_syscall
; 155 is initialized by the NFS code, if present.
; XXX this is a problem!!!
155 AUE_NFS_SVC UNIMPL nfssvc
==== //depot/projects/dtrace6/src/sys/compat/linux/linux_file.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.91.2.4 2007/08/29 15:04:25 netchild Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.91.2.5 2008/04/24 10:46:18 dfr Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -960,6 +960,8 @@
bsd_flock->l_start = (off_t)linux_flock->l_start;
bsd_flock->l_len = (off_t)linux_flock->l_len;
bsd_flock->l_pid = (pid_t)linux_flock->l_pid;
+ bsd_flock->l_sysid = 0;
+ bsd_flock->l_sysid = 0;
}
static void
==== //depot/projects/dtrace6/src/sys/compat/svr4/svr4_fcntl.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.35 2005/02/07 21:53:41 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/svr4/svr4_fcntl.c,v 1.35.2.1 2008/04/24 10:46:18 dfr Exp $");
#include "opt_mac.h"
@@ -189,7 +189,7 @@
oflp->l_start = (off_t) iflp->l_start;
oflp->l_len = (off_t) iflp->l_len;
oflp->l_pid = (pid_t) iflp->l_pid;
-
+ oflp->l_sysid = iflp->l_sysid;
}
static void
@@ -215,7 +215,7 @@
oflp->l_whence = (short) iflp->l_whence;
oflp->l_start = (svr4_off64_t) iflp->l_start;
oflp->l_len = (svr4_off64_t) iflp->l_len;
- oflp->l_sysid = 0;
+ oflp->l_sysid = iflp->l_sysid;
oflp->l_pid = (svr4_pid_t) iflp->l_pid;
}
==== //depot/projects/dtrace6/src/sys/conf/NOTES#3 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.39 2008/03/12 11:33:06 rwatson Exp $
+# $FreeBSD: src/sys/conf/NOTES,v 1.1325.2.40 2008/04/24 10:46:18 dfr Exp $
#
# NOTES -- Lines that can be cut/pasted into kernel and hints configs.
#
@@ -881,6 +881,8 @@
options HPFS #OS/2 File system
options MSDOSFS #MS DOS File System (FAT, FAT32)
options NFSSERVER #Network File System server
+# XXX don't build NFSLOCKD since it conflicts with ATM_SPANS
+#options NFSLOCKD #Network Lock Manager
options NTFS #NT File System
options NULLFS #NULL filesystem
# Broken (depends on NCP):
==== //depot/projects/dtrace6/src/sys/conf/files#5 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1031.2.72 2008/03/19 01:11:38 yongari Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1031.2.73 2008/04/24 10:46:18 dfr Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -1893,6 +1893,12 @@
nfsserver/nfs_srvcache.c optional nfsserver
nfsserver/nfs_srvsubs.c optional nfsserver
nfsserver/nfs_syscalls.c optional nfsserver
+nlm/nlm_prot_clnt.c optional nfslockd
+nlm/nlm_prot_impl.c optional nfslockd
+nlm/nlm_prot_server.c optional nfslockd
+nlm/nlm_prot_svc.c optional nfslockd
+nlm/nlm_prot_xdr.c optional nfslockd
+nlm/sm_inter_xdr.c optional nfslockd
# crypto support
opencrypto/cast.c optional crypto
opencrypto/cast.c optional ipsec ipsec_esp
@@ -1932,7 +1938,27 @@
posix4/ksched.c optional _kposix_priority_scheduling
posix4/p1003_1b.c standard
posix4/posix4_mib.c standard
+rpc/auth_none.c optional nfslockd
+rpc/auth_unix.c optional nfslockd
+rpc/authunix_prot.c optional nfslockd
+rpc/clnt_dg.c optional nfslockd
+rpc/clnt_rc.c optional nfslockd
+rpc/clnt_vc.c optional nfslockd
+rpc/getnetconfig.c optional nfslockd
+rpc/inet_ntop.c optional nfslockd
+rpc/inet_pton.c optional nfslockd
+rpc/rpc_callmsg.c optional nfslockd
+rpc/rpc_generic.c optional nfslockd
+rpc/rpc_prot.c optional nfslockd
+rpc/rpcb_clnt.c optional nfslockd
+rpc/rpcb_prot.c optional nfslockd
rpc/rpcclnt.c optional nfsclient
+rpc/svc.c optional nfslockd
+rpc/svc_auth.c optional nfslockd
+rpc/svc_auth_unix.c optional nfslockd
+rpc/svc_dg.c optional nfslockd
+rpc/svc_generic.c optional nfslockd
+rpc/svc_vc.c optional nfslockd
security/audit/audit.c optional audit
security/audit/audit_arg.c optional audit
security/audit/audit_bsm.c optional audit
@@ -2007,3 +2033,9 @@
vm/vm_unix.c standard
vm/vm_zeroidle.c standard
vm/vnode_pager.c standard
+xdr/xdr.c optional nfslockd
+xdr/xdr_array.c optional nfslockd
+xdr/xdr_mbuf.c optional nfslockd
+xdr/xdr_mem.c optional nfslockd
+xdr/xdr_reference.c optional nfslockd
+xdr/xdr_sizeof.c optional nfslockd
==== //depot/projects/dtrace6/src/sys/conf/options#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.510.2.23 2007/09/14 22:44:37 obrien Exp $
+# $FreeBSD: src/sys/conf/options,v 1.510.2.24 2008/04/24 10:46:18 dfr Exp $
#
# On the handling of kernel options
#
@@ -389,6 +389,8 @@
TCP_SACK_DEBUG opt_tcp_sack.h
TCP_DROP_SYNFIN opt_tcp_input.h
XBONEHACK
+KRPC
+NFSLOCKD
# Netgraph(4). Use option NETGRAPH to enable the base netgraph code.
# Each netgraph node type can be either be compiled into the kernel
==== //depot/projects/dtrace6/src/sys/dev/usb/ehci_pci.c#3 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.18.2.3 2008/03/19 16:39:07 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/ehci_pci.c,v 1.18.2.4 2008/04/23 18:54:51 jhb Exp $");
/*
* USB Enhanced Host Controller Driver, a.k.a. USB 2.0 controller.
@@ -115,6 +115,10 @@
static const char *ehci_device_ich6 = "Intel 82801FB (ICH6) USB 2.0 controller";
#define PCI_EHCI_DEVICEID_ICH7 0x27cc8086
static const char *ehci_device_ich7 = "Intel 82801GB/R (ICH7) USB 2.0 controller";
+#define PCI_EHCI_DEVICEID_ICH8_A 0x28368086
+static const char *ehci_device_ich8_a = "Intel 82801H (ICH8) USB 2.0 controller USB2-A";
+#define PCI_EHCI_DEVICEID_ICH8_B 0x283a8086
+static const char *ehci_device_ich8_b = "Intel 82801H (ICH8) USB 2.0 controller USB2-B";
/* NEC */
#define PCI_EHCI_DEVICEID_NEC 0x00e01033
@@ -224,6 +228,10 @@
return (ehci_device_ich6);
case PCI_EHCI_DEVICEID_ICH7:
return (ehci_device_ich7);
+ case PCI_EHCI_DEVICEID_ICH8_A:
+ return (ehci_device_ich8_a);
+ case PCI_EHCI_DEVICEID_ICH8_B:
+ return (ehci_device_ich8_b);
case PCI_EHCI_DEVICEID_NEC:
return (ehci_device_nec);
case PCI_EHCI_DEVICEID_NF2:
==== //depot/projects/dtrace6/src/sys/dev/usb/uhci_pci.c#2 (text+ko) ====
@@ -36,7 +36,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.57 2005/03/01 07:50:11 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/uhci_pci.c,v 1.57.2.1 2008/04/23 18:54:51 jhb Exp $");
/* Universal Host Controller Interface
*
@@ -139,6 +139,21 @@
#define PCI_UHCI_DEVICEID_ICH6_D 0x265b8086
static const char *uhci_device_ich6_d = "Intel 82801FB/FR/FW/FRW (ICH6) USB controller USB-D";
+#define PCI_UHCI_DEVICEID_ICH8_A 0x28308086
+static const char *uhci_device_ich8_a = "Intel 82801H (ICH8) USB controller USB-A";
+
+#define PCI_UHCI_DEVICEID_ICH8_B 0x28318086
+static const char *uhci_device_ich8_b = "Intel 82801H (ICH8) USB controller USB-B";
+
+#define PCI_UHCI_DEVICEID_ICH8_C 0x28328086
+static const char *uhci_device_ich8_c = "Intel 82801H (ICH8) USB controller USB-C";
+
+#define PCI_UHCI_DEVICEID_ICH8_D 0x28348086
+static const char *uhci_device_ich8_d = "Intel 82801H (ICH8) USB controller USB-D";
+
+#define PCI_UHCI_DEVICEID_ICH8_E 0x28358086
+static const char *uhci_device_ich8_e = "Intel 82801H (ICH8) USB controller USB-E";
+
#define PCI_UHCI_DEVICEID_440MX 0x719a8086
static const char *uhci_device_440mx = "Intel 82443MX USB controller";
@@ -231,6 +246,16 @@
return (uhci_device_ich6_c);
} else if (device_id == PCI_UHCI_DEVICEID_ICH6_D) {
return (uhci_device_ich6_d);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_A) {
+ return (uhci_device_ich8_a);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_B) {
+ return (uhci_device_ich8_b);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_C) {
+ return (uhci_device_ich8_c);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_D) {
+ return (uhci_device_ich8_d);
+ } else if (device_id == PCI_UHCI_DEVICEID_ICH8_E) {
+ return (uhci_device_ich8_e);
} else if (device_id == PCI_UHCI_DEVICEID_440MX) {
return (uhci_device_440mx);
} else if (device_id == PCI_UHCI_DEVICEID_460GX) {
==== //depot/projects/dtrace6/src/sys/fs/msdosfs/msdosfs_vnops.c#2 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.160.2.4 2007/07/08 15:30:27 rodrigc Exp $ */
+/* $FreeBSD: src/sys/fs/msdosfs/msdosfs_vnops.c,v 1.160.2.5 2008/04/24 10:46:18 dfr Exp $ */
/* $NetBSD: msdosfs_vnops.c,v 1.68 1998/02/10 14:10:04 mrg Exp $ */
/*-
@@ -84,6 +84,7 @@
* Prototypes for MSDOSFS vnode operations
*/
static vop_advlock_t msdosfs_advlock;
+static vop_advlockasync_t msdosfs_advlockasync;
static vop_create_t msdosfs_create;
static vop_mknod_t msdosfs_mknod;
static vop_open_t msdosfs_open;
@@ -1889,12 +1890,29 @@
return (lf_advlock(ap, &dep->de_lockf, dep->de_FileSize));
}
+static int
+msdosfs_advlockasync(ap)
+ struct vop_advlockasync_args /* {
+ struct vnode *a_vp;
+ u_char a_id;
+ int a_op;
+ struct flock *a_fl;
+ int a_flags;
+ struct task *a_task;
+ } */ *ap;
+{
+ struct denode *dep = VTODE(ap->a_vp);
+
+ return (lf_advlockasync(ap, &dep->de_lockf, dep->de_FileSize));
+}
+
/* Global vfs data structures for msdosfs */
struct vop_vector msdosfs_vnodeops = {
.vop_default = &default_vnodeops,
.vop_access = msdosfs_access,
.vop_advlock = msdosfs_advlock,
+ .vop_advlockasync = msdosfs_advlockasync,
.vop_bmap = msdosfs_bmap,
.vop_cachedlookup = msdosfs_lookup,
.vop_open = msdosfs_open,
==== //depot/projects/dtrace6/src/sys/fs/smbfs/smbfs_vnops.c#2 (text+ko) ====
@@ -29,7 +29,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.61.2.2 2006/05/31 22:31:21 cperciva Exp $
+ * $FreeBSD: src/sys/fs/smbfs/smbfs_vnops.c,v 1.61.2.3 2008/04/24 10:46:18 dfr Exp $
*/
#include <sys/param.h>
#include <sys/systm.h>
@@ -998,8 +998,11 @@
lkop = SMB_LOCK_EXCL;
error = smbfs_smb_lock(np, lkop, id, start, end, &scred);
if (error) {
+ int oldtype = fl->l_type;
+ fl->l_type = F_UNLCK;
ap->a_op = F_UNLCK;
lf_advlock(ap, &np->n_lockf, size);
+ fl->l_type = oldtype;
}
break;
case F_UNLCK:
==== //depot/projects/dtrace6/src/sys/i386/conf/GENERIC#3 (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.429.2.15 2007/12/15 06:03:43 scottl Exp $
+# $FreeBSD: src/sys/i386/conf/GENERIC,v 1.429.2.17 2008/04/24 13:08:30 dfr Exp $
machine i386
cpu I486_CPU
@@ -40,6 +40,7 @@
options MD_ROOT # MD is a potential root device
options NFSCLIENT # Network Filesystem Client
options NFSSERVER # Network Filesystem Server
+options NFSLOCKD # Network Lock Manager
options NFS_ROOT # NFS usable as /, requires NFSCLIENT
options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
==== //depot/projects/dtrace6/src/sys/i386/conf/XBOX#2 (text+ko) ====
@@ -1,7 +1,7 @@
#
# XBOX -- kernel for an XBOX
#
-# $FreeBSD: src/sys/i386/conf/XBOX,v 1.7.2.1 2006/08/23 16:28:03 rink Exp $
+# $FreeBSD: src/sys/i386/conf/XBOX,v 1.7.2.2 2008/04/24 10:46:19 dfr Exp $
machine i386
cpu I686_CPU # Celeron
ident XBOX
@@ -30,6 +30,7 @@
#options MD_ROOT # MD is a potential root device
options NFSCLIENT # Network Filesystem Client
#options NFSSERVER # Network Filesystem Server
+#options NFSLOCKD # Network Lock Manager
#options NFS_ROOT # NFS usable as /, requires NFSCLIENT
#options MSDOSFS # MSDOS Filesystem
options CD9660 # ISO 9660 Filesystem
==== //depot/projects/dtrace6/src/sys/i386/ibcs2/ibcs2_fcntl.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.28 2005/02/07 22:02:18 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/i386/ibcs2/ibcs2_fcntl.c,v 1.28.2.1 2008/04/24 10:46:19 dfr Exp $");
#include "opt_spx_hack.h"
@@ -93,7 +93,7 @@
iflp->l_whence = (short)flp->l_whence;
iflp->l_start = (ibcs2_off_t)flp->l_start;
iflp->l_len = (ibcs2_off_t)flp->l_len;
- iflp->l_sysid = 0;
+ iflp->l_sysid = flp->l_sysid;
iflp->l_pid = (ibcs2_pid_t)flp->l_pid;
}
@@ -127,6 +127,7 @@
break;
}
flp->l_whence = iflp->l_whence;
+ flp->l_sysid = iflp->l_sysid;
}
/* convert iBCS2 mode into NetBSD mode */
==== //depot/projects/dtrace6/src/sys/ia64/conf/GENERIC#2 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.72.2.3 2006/10/09 18:41:36 simon Exp $
+# $FreeBSD: src/sys/ia64/conf/GENERIC,v 1.72.2.4 2008/04/24 10:46:19 dfr Exp $
machine ia64
cpu ITANIUM
@@ -40,6 +40,7 @@
options MSDOSFS # MSDOS Filesystem
options NFSCLIENT # Network Filesystem Client
options NFSSERVER # Network Filesystem Server
+options NFSLOCKD # Network Lock Manager
options NFS_ROOT # NFS usable as root device
options PROCFS # Process filesystem (/proc)
options PSEUDOFS # Pseudo-filesystem framework
==== //depot/projects/dtrace6/src/sys/kern/init_sysent.c#2 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/kern/init_sysent.c,v 1.195.2.5 2006/10/10 13:47:59 rwatson Exp $
- * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.5 2006/10/10 13:19:47 rwatson Exp
+ * $FreeBSD: src/sys/kern/init_sysent.c,v 1.195.2.6 2008/04/24 10:52:30 dfr Exp $
+ * created from FreeBSD: src/sys/kern/syscalls.master,v 1.198.2.6 2008/04/24 10:46:19 dfr Exp
*/
#include "opt_compat.h"
@@ -183,7 +183,7 @@
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 151 = sem_lock */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 152 = sem_wakeup */
{ 0, (sy_call_t *)nosys, AUE_NULL }, /* 153 = asyncdaemon */
- { 0, (sy_call_t *)nosys, AUE_NULL }, /* 154 = nosys */
+ { SYF_MPSAFE | AS(nlm_syscall_args), (sy_call_t *)lkmressys, AUE_NULL }, /* 154 = nlm_syscall */
{ SYF_MPSAFE | AS(nfssvc_args), (sy_call_t *)nosys, AUE_NULL }, /* 155 = nfssvc */
{ compat(AS(ogetdirentries_args),getdirentries), AUE_GETDIRENTRIES }, /* 156 = old getdirentries */
{ compat4(SYF_MPSAFE | AS(freebsd4_statfs_args),statfs), AUE_STATFS }, /* 157 = old statfs */
==== //depot/projects/dtrace6/src/sys/kern/kern_descrip.c#3 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.279.2.16 2008/02/14 11:46:08 simon Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_descrip.c,v 1.279.2.17 2008/04/24 10:46:19 dfr Exp $");
#include "opt_compat.h"
#include "opt_ddb.h"
@@ -321,28 +321,67 @@
fcntl(struct thread *td, struct fcntl_args *uap)
{
struct flock fl;
+ struct oflock ofl;
intptr_t arg;
int error;
+ int cmd;
error = 0;
+ cmd = uap->cmd;
switch (uap->cmd) {
- case F_GETLK:
- case F_SETLK:
- case F_SETLKW:
- error = copyin((void *)(intptr_t)uap->arg, &fl, sizeof(fl));
+ case F_OGETLK:
+ case F_OSETLK:
+ case F_OSETLKW:
+ /*
+ * Convert old flock structure to new.
+ */
+ error = copyin((void *)(intptr_t)uap->arg, &ofl, sizeof(ofl));
+ fl.l_start = ofl.l_start;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 08:26:16 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id ED390106567E; Fri, 25 Apr 2008 08:26:15 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id AC3A9106567A
for <perforce@freebsd.org>; Fri, 25 Apr 2008 08:26:15 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 87FA78FC1A
for <perforce@freebsd.org>; Fri, 25 Apr 2008 08:26:15 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3P8QFV3096433
for <perforce@freebsd.org>; Fri, 25 Apr 2008 08:26:15 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3P8QDij096431
for perforce@freebsd.org; Fri, 25 Apr 2008 08:26:13 GMT
(envelope-from jb@freebsd.org)
Date: Fri, 25 Apr 2008 08:26:13 GMT
Message-Id: <200804250826.m3P8QDij096431@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140587 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 08:26:16 -0000
http://perforce.freebsd.org/chv.cgi?CH=140587
Change 140587 by jb@freebsd3 on 2008/04/25 08:25:39
IFC
Affected files ...
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/README#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_DEPEND.main.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libchain.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d.out#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.statusrate.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d.out#2 integrate
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 08:55:46 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B93B11065674; Fri, 25 Apr 2008 08:55:46 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 7A524106566B
for <perforce@freebsd.org>; Fri, 25 Apr 2008 08:55:46 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 3E4168FC21
for <perforce@freebsd.org>; Fri, 25 Apr 2008 08:55:46 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3P8tkjI008015
for <perforce@freebsd.org>; Fri, 25 Apr 2008 08:55:46 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3P8tkqG008013
for perforce@freebsd.org; Fri, 25 Apr 2008 08:55:46 GMT
(envelope-from jb@freebsd.org)
Date: Fri, 25 Apr 2008 08:55:46 GMT
Message-Id: <200804250855.m3P8tkqG008013@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140588 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 08:55:47 -0000
http://perforce.freebsd.org/chv.cgi?CH=140588
Change 140588 by jb@freebsd3 on 2008/04/25 08:54:50
Remove a stray file from sun4v work long ago.
Affected files ...
.. //depot/projects/dtrace/src/sys/sun4v/sun4v/sc_machdep.c#2 delete
Differences ...
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 09:54:49 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 29ADC1065678; Fri, 25 Apr 2008 09:54:49 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id DD66B106564A
for <perforce@freebsd.org>; Fri, 25 Apr 2008 09:54:48 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id B6AF38FC14
for <perforce@freebsd.org>; Fri, 25 Apr 2008 09:54:48 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3P9smu6011765
for <perforce@freebsd.org>; Fri, 25 Apr 2008 09:54:48 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3P9smKH011763
for perforce@freebsd.org; Fri, 25 Apr 2008 09:54:48 GMT
(envelope-from jb@freebsd.org)
Date: Fri, 25 Apr 2008 09:54:48 GMT
Message-Id: <200804250954.m3P9smKH011763@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140595 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 09:54:49 -0000
http://perforce.freebsd.org/chv.cgi?CH=140595
Change 140595 by jb@freebsd3 on 2008/04/25 09:54:46
IFC.
This will break the build of the DTrace libraries because these sources are
from the vendor branch in CVS.
Affected files ...
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_subr.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/libctf.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_as.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_as.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_buf.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_inttab.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_inttab.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_list.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_list.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pcb.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pcb.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/ctf_headers.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/list.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/list.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/memory.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/memory.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/symbol.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/symbol.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/utils.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/utils.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/compare.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fifo.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fifo.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/hash.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/hash.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/iidesc.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/input.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stack.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stack.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/util.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/dump/dump.c#3 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union.h#7 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#15 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#15 integrate
Differences ...
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_subr.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/libctf.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_as.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_as.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_buf.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_buf.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#4 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_decl.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dis.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_grammar.y#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#4 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_inttab.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_inttab.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#4 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_list.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_list.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#4 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pcb.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pcb.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#4 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#4 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_regset.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_string.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_strtab.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_xlator.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/ctf_headers.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/list.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/list.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/memory.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/memory.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/symbol.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/symbol.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/utils.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/utils.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.h#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/compare.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fifo.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fifo.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#3 (text+ko) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/hash.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/hash.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/iidesc.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/input.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stack.c#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stack.h#2 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.h#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.h#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/util.c#3 (text) ====
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/dump/dump.c#3 (text) ====
==== //depot/projects/dtrace/src/sys/fs/unionfs/union.h#7 (text+ko) ====
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*
* @(#)union.h 8.9 (Berkeley) 12/10/94
- * $FreeBSD: src/sys/fs/unionfs/union.h,v 1.36 2007/10/14 13:55:38 daichi Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union.h,v 1.37 2008/04/25 09:38:48 daichi Exp $
*/
#ifdef _KERNEL
@@ -83,7 +83,12 @@
struct vnode *un_uppervp; /* upper side vnode */
struct vnode *un_dvp; /* parent unionfs vnode */
struct vnode *un_vnode; /* Back pointer */
- LIST_HEAD(, unionfs_node_status) un_unshead; /* unionfs status head */
+ LIST_HEAD(, unionfs_node_status) un_unshead;
+ /* unionfs status head */
+ LIST_HEAD(unionfs_node_hashhead, unionfs_node) *un_hashtbl;
+ /* dir vnode hash table */
+ LIST_ENTRY(unionfs_node) un_hash; /* hash list entry */
+ u_long un_hashmask; /* bit mask */
char *un_path; /* path */
int un_flag; /* unionfs node flag */
};
==== //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#15 (text+ko) ====
@@ -33,7 +33,7 @@
* SUCH DAMAGE.
*
* @(#)union_subr.c 8.20 (Berkeley) 5/20/95
- * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.100 2008/04/06 20:08:50 attilio Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_subr.c,v 1.102 2008/04/25 09:38:48 daichi Exp $
*/
#include <sys/param.h>
@@ -60,6 +60,9 @@
#include <fs/unionfs/union.h>
+#define NUNIONFSNODECACHE 16
+
+static MALLOC_DEFINE(M_UNIONFSHASH, "UNIONFS hash", "UNIONFS hash table");
MALLOC_DEFINE(M_UNIONFSNODE, "UNIONFS node", "UNIONFS vnode private part");
MALLOC_DEFINE(M_UNIONFSPATH, "UNIONFS path", "UNIONFS path private part");
@@ -82,7 +85,118 @@
return (0);
}
+static struct unionfs_node_hashhead *
+unionfs_get_hashhead(struct vnode *dvp, char *path)
+{
+ int count;
+ char hash;
+ struct unionfs_node *unp;
+
+ hash = 0;
+ unp = VTOUNIONFS(dvp);
+ if (path != NULL) {
+ for (count = 0; path[count]; count++)
+ hash += path[count];
+ }
+
+ return (&(unp->un_hashtbl[hash & (unp->un_hashmask)]));
+}
+
+/*
+ * Get the cached vnode. (only VDIR)
+ */
+static struct vnode *
+unionfs_get_cached_vdir(struct vnode *uvp, struct vnode *lvp,
+ struct vnode *dvp, char *path)
+{
+ struct unionfs_node_hashhead *hd;
+ struct unionfs_node *unp;
+ struct vnode *vp;
+
+ KASSERT((uvp == NULLVP || uvp->v_type == VDIR),
+ ("unionfs_get_cached_vdir: v_type != VDIR"));
+ KASSERT((lvp == NULLVP || lvp->v_type == VDIR),
+ ("unionfs_get_cached_vdir: v_type != VDIR"));
+
+ VI_LOCK(dvp);
+ hd = unionfs_get_hashhead(dvp, path);
+ LIST_FOREACH(unp, hd, un_hash) {
+ if (!strcmp(unp->un_path, path)) {
+ vp = UNIONFSTOV(unp);
+ VI_LOCK_FLAGS(vp, MTX_DUPOK);
+ VI_UNLOCK(dvp);
+ vp->v_iflag &= ~VI_OWEINACT;
+ if ((vp->v_iflag & (VI_DOOMED | VI_DOINGINACT)) != 0) {
+ VI_UNLOCK(vp);
+ vp = NULLVP;
+ } else
+ VI_UNLOCK(vp);
+ return (vp);
+ }
+ }
+ VI_UNLOCK(dvp);
+
+ return (NULLVP);
+}
+
+/*
+ * Add the new vnode into cache. (only VDIR)
+ */
+static struct vnode *
+unionfs_ins_cached_vdir(struct unionfs_node *uncp,
+ struct vnode *dvp, char *path)
+{
+ struct unionfs_node_hashhead *hd;
+ struct unionfs_node *unp;
+ struct vnode *vp;
+
+ KASSERT((uncp->un_uppervp==NULLVP || uncp->un_uppervp->v_type==VDIR),
+ ("unionfs_ins_cached_vdir: v_type != VDIR"));
+ KASSERT((uncp->un_lowervp==NULLVP || uncp->un_lowervp->v_type==VDIR),
+ ("unionfs_ins_cached_vdir: v_type != VDIR"));
+
+ VI_LOCK(dvp);
+ hd = unionfs_get_hashhead(dvp, path);
+ LIST_FOREACH(unp, hd, un_hash) {
+ if (!strcmp(unp->un_path, path)) {
+ vp = UNIONFSTOV(unp);
+ VI_LOCK_FLAGS(vp, MTX_DUPOK);
+ vp->v_iflag &= ~VI_OWEINACT;
+ if ((vp->v_iflag & (VI_DOOMED | VI_DOINGINACT)) != 0) {
+ LIST_INSERT_HEAD(hd, uncp, un_hash);
+ VI_UNLOCK(vp);
+ vp = NULLVP;
+ } else
+ VI_UNLOCK(vp);
+ VI_UNLOCK(dvp);
+ return (vp);
+ }
+ }
+
+ LIST_INSERT_HEAD(hd, uncp, un_hash);
+ VI_UNLOCK(dvp);
+
+ return (NULLVP);
+}
+
/*
+ * Remove the vnode. (only VDIR)
+ */
+static void
+unionfs_rem_cached_vdir(struct unionfs_node *unp, struct vnode *dvp)
+{
+ KASSERT((unp != NULL), ("unionfs_rem_cached_vdir: null node"));
+ KASSERT((dvp != NULLVP),
+ ("unionfs_rem_cached_vdir: null parent vnode"));
+ KASSERT((unp->un_hash.le_prev != NULL),
+ ("unionfs_rem_cached_vdir: null hash"));
+
+ VI_LOCK(dvp);
+ LIST_REMOVE(unp, un_hash);
+ VI_UNLOCK(dvp);
+}
+
+/*
* Make a new or get existing unionfs node.
*
* uppervp and lowervp should be unlocked. Because if new unionfs vnode is
@@ -100,21 +214,36 @@
struct vnode *vp;
int error;
int lkflags;
+ enum vtype vt;
char *path;
ump = MOUNTTOUNIONFSMOUNT(mp);
lkflags = (cnp ? cnp->cn_lkflags : 0);
path = (cnp ? cnp->cn_nameptr : NULL);
+ *vpp = NULLVP;
if (uppervp == NULLVP && lowervp == NULLVP)
panic("unionfs_nodeget: upper and lower is null");
+ vt = (uppervp != NULLVP ? uppervp->v_type : lowervp->v_type);
+
/* If it has no ISLASTCN flag, path check is skipped. */
if (cnp && !(cnp->cn_flags & ISLASTCN))
path = NULL;
+ /* check the vdir cache */
+ if (path != NULL && dvp != NULLVP && vt == VDIR) {
+ vp = unionfs_get_cached_vdir(uppervp, lowervp, dvp, path);
+ if (vp != NULLVP) {
+ vref(vp);
+ *vpp = vp;
+ goto unionfs_nodeget_out;
+ }
+ }
+
if ((uppervp == NULLVP || ump->um_uppervp != uppervp) ||
(lowervp == NULLVP || ump->um_lowervp != lowervp)) {
+ /* dvp will be NULLVP only in case of root vnode. */
if (dvp == NULLVP)
return (EINVAL);
}
@@ -144,6 +273,10 @@
if (lowervp != NULLVP)
vref(lowervp);
+ if (vt == VDIR)
+ unp->un_hashtbl = hashinit(NUNIONFSNODECACHE, M_UNIONFSHASH,
+ &(unp->un_hashmask));
+
unp->un_vnode = vp;
unp->un_uppervp = uppervp;
unp->un_lowervp = lowervp;
@@ -159,18 +292,36 @@
bcopy(cnp->cn_nameptr, unp->un_path, cnp->cn_namelen);
unp->un_path[cnp->cn_namelen] = '\0';
}
- vp->v_type = (uppervp != NULLVP ? uppervp->v_type : lowervp->v_type);
+ vp->v_type = vt;
vp->v_data = unp;
if ((uppervp != NULLVP && ump->um_uppervp == uppervp) &&
(lowervp != NULLVP && ump->um_lowervp == lowervp))
vp->v_vflag |= VV_ROOT;
+ if (path != NULL && dvp != NULLVP && vt == VDIR)
+ *vpp = unionfs_ins_cached_vdir(unp, dvp, path);
+ if ((*vpp) != NULLVP) {
+ if (dvp != NULLVP)
+ vrele(dvp);
+ if (uppervp != NULLVP)
+ vrele(uppervp);
+ if (lowervp != NULLVP)
+ vrele(lowervp);
+
+ unp->un_uppervp = NULLVP;
+ unp->un_lowervp = NULLVP;
+ unp->un_dvp = NULLVP;
+ vrele(vp);
+ vp = *vpp;
+ vref(vp);
+ } else
+ *vpp = vp;
+
+unionfs_nodeget_out:
if (lkflags & LK_TYPE_MASK)
vn_lock(vp, lkflags | LK_RETRY);
- *vpp = vp;
-
return (0);
}
@@ -185,6 +336,7 @@
struct unionfs_node_status *unsp, *unsp_tmp;
struct vnode *lvp;
struct vnode *uvp;
+ struct vnode *dvp;
/*
* Use the interlock to protect the clearing of v_data to
@@ -194,6 +346,7 @@
unp = VTOUNIONFS(vp);
lvp = unp->un_lowervp;
uvp = unp->un_uppervp;
+ dvp = unp->un_dvp;
unp->un_lowervp = unp->un_uppervp = NULLVP;
vp->v_vnlock = &(vp->v_lock);
@@ -205,6 +358,9 @@
VOP_UNLOCK(uvp, 0);
vp->v_object = NULL;
+ if (unp->un_path != NULL && dvp != NULLVP && vp->v_type == VDIR)
+ unionfs_rem_cached_vdir(unp, dvp);
+
if (lvp != NULLVP) {
vfslocked = VFS_LOCK_GIANT(lvp->v_mount);
vrele(lvp);
@@ -215,17 +371,20 @@
vrele(uvp);
VFS_UNLOCK_GIANT(vfslocked);
}
- if (unp->un_dvp != NULLVP) {
- vfslocked = VFS_LOCK_GIANT(unp->un_dvp->v_mount);
- vrele(unp->un_dvp);
+ if (dvp != NULLVP) {
+ vfslocked = VFS_LOCK_GIANT(dvp->v_mount);
+ vrele(dvp);
VFS_UNLOCK_GIANT(vfslocked);
unp->un_dvp = NULLVP;
}
- if (unp->un_path) {
+ if (unp->un_path != NULL) {
free(unp->un_path, M_UNIONFSPATH);
unp->un_path = NULL;
}
+ if (unp->un_hashtbl != NULL)
+ hashdestroy(unp->un_hashtbl, M_UNIONFSHASH, unp->un_hashmask);
+
LIST_FOREACH_SAFE(unsp, &(unp->un_unshead), uns_list, unsp_tmp) {
LIST_REMOVE(unsp, uns_list);
free(unsp, M_TEMP);
@@ -541,10 +700,12 @@
unsigned count, lockrec;
struct vnode *vp;
struct vnode *lvp;
+ struct vnode *dvp;
vp = UNIONFSTOV(unp);
lvp = unp->un_lowervp;
ASSERT_VOP_ELOCKED(lvp, "unionfs_node_update");
+ dvp = unp->un_dvp;
/*
* lock update
@@ -556,6 +717,19 @@
lockrec = lvp->v_vnlock->lk_recurse;
for (count = 0; count < lockrec; count++)
vn_lock(uvp, LK_EXCLUSIVE | LK_CANRECURSE | LK_RETRY);
+
+ /*
+ * cache update
+ */
+ if (unp->un_path != NULL && dvp != NULLVP && vp->v_type == VDIR) {
+ static struct unionfs_node_hashhead *hd;
+
+ VI_LOCK(dvp);
+ hd = unionfs_get_hashhead(dvp, unp->un_path);
+ LIST_REMOVE(unp, un_hash);
+ LIST_INSERT_HEAD(hd, unp, un_hash);
+ VI_UNLOCK(dvp);
+ }
}
/*
@@ -989,8 +1163,14 @@
uio.uio_resid = iov.iov_len;
error = VOP_READDIR(lvp, &uio, cred, &eofflag, NULL, NULL);
- if (error)
+ if (error != 0)
+ break;
+ if (eofflag == 0 && uio.uio_resid == sizeof(buf)) {
+#ifdef DIAGNOSTIC
+ panic("bad readdir response from lower FS.");
+#endif
break;
+ }
edp = (struct dirent*)&buf[sizeof(buf) - uio.uio_resid];
for (dp = (struct dirent*)buf; !error && dp < edp;
==== //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#15 (text+ko) ====
@@ -34,7 +34,7 @@
* SUCH DAMAGE.
*
* @(#)union_vnops.c 8.32 (Berkeley) 6/23/95
- * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.153 2008/02/25 18:45:56 attilio Exp $
+ * $FreeBSD: src/sys/fs/unionfs/union_vnops.c,v 1.154 2008/04/25 09:44:47 daichi Exp $
*
*/
@@ -1165,6 +1165,9 @@
}
}
+ if (rfvp == rtvp)
+ goto unionfs_rename_abort;
+
if (needrelookup != 0) {
if ((error = vn_lock(fdvp, LK_EXCLUSIVE)) != 0)
goto unionfs_rename_abort;
@@ -1192,10 +1195,6 @@
cache_purge(fdvp);
}
- if (fdvp != rfdvp)
- vrele(fdvp);
- if (fvp != rfvp)
- vrele(fvp);
if (ltdvp != NULLVP)
VOP_UNLOCK(ltdvp, 0);
if (tdvp != rtdvp)
@@ -1208,27 +1207,31 @@
else
vrele(tvp);
}
+ if (fdvp != rfdvp)
+ vrele(fdvp);
+ if (fvp != rfvp)
+ vrele(fvp);
UNIONFS_INTERNAL_DEBUG("unionfs_rename: leave (%d)\n", error);
return (error);
unionfs_rename_abort:
- if (fdvp != rfdvp)
- vrele(rfdvp);
- if (fvp != rfvp)
- vrele(rfvp);
+ vput(tdvp);
if (tdvp != rtdvp)
vrele(rtdvp);
- vput(tdvp);
- if (tvp != rtvp && rtvp != NULLVP)
- vrele(rtvp);
if (tvp != NULLVP) {
if (tdvp != tvp)
vput(tvp);
else
vrele(tvp);
}
+ if (tvp != rtvp && rtvp != NULLVP)
+ vrele(rtvp);
+ if (fdvp != rfdvp)
+ vrele(rfdvp);
+ if (fvp != rfvp)
+ vrele(rfvp);
vrele(fdvp);
vrele(fvp);
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 12:42:22 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 0589D1065773; Fri, 25 Apr 2008 12:42:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 42D6F10656E2
for <perforce@freebsd.org>; Fri, 25 Apr 2008 12:42:18 +0000 (UTC)
(envelope-from jhb@freebsd.org)
Received: from elvis.mu.org (elvis.mu.org [192.203.228.196])
by mx1.freebsd.org (Postfix) with ESMTP id EBCF98FC19
for <perforce@freebsd.org>; Fri, 25 Apr 2008 12:42:17 +0000 (UTC)
(envelope-from jhb@freebsd.org)
Received: from zion.baldwin.cx (unknown [208.65.91.234])
by elvis.mu.org (Postfix) with ESMTP id 4B8BB1A4D87;
Fri, 25 Apr 2008 05:42:17 -0700 (PDT)
From: John Baldwin <jhb@freebsd.org>
To: Warner Losh <imp@freebsd.org>
Date: Fri, 25 Apr 2008 08:27:29 -0400
User-Agent: KMail/1.9.7
References: <200804132159.m3DLxs1b004670@repoman.freebsd.org>
In-Reply-To: <200804132159.m3DLxs1b004670@repoman.freebsd.org>
MIME-Version: 1.0
Content-Type: text/plain;
charset="iso-8859-15"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline
Message-Id: <200804250827.30083.jhb@freebsd.org>
Cc: Perforce Change Reviews <perforce@freebsd.org>
Subject: Re: PERFORCE change 140000 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 12:42:22 -0000
On Sunday 13 April 2008 05:59:54 pm Warner Losh wrote:
> http://perforce.freebsd.org/chv.cgi?CH=140000
>
> Change 140000 by imp@imp_lighthouse on 2008/04/13 21:59:12
>
> Allow MSI to be compiled out.
Maybe __HAVE_MSI set in <machine/param.h>?
> Affected files ...
>
> .. //depot/projects/arm/src/sys/dev/pci/pci.c#32 edit
> .. //depot/projects/arm/src/sys/dev/pci/pci_pci.c#14 edit
>
> Differences ...
>
> ==== //depot/projects/arm/src/sys/dev/pci/pci.c#32 (text+ko) ====
>
> @@ -101,6 +101,7 @@
> int reg, uint32_t data);
> #endif
> static void pci_read_vpd(device_t pcib, pcicfgregs *cfg);
> +#ifdef MSI
> static void pci_disable_msi(device_t dev);
> static void pci_enable_msi(device_t dev, uint64_t address,
> uint16_t data);
> @@ -111,6 +112,7 @@
> static int pci_msi_blacklisted(void);
> static void pci_resume_msi(device_t dev);
> static void pci_resume_msix(device_t dev);
> +#endif
>
> static device_method_t pci_methods[] = {
> /* Device interface */
> @@ -155,12 +157,14 @@
> DEVMETHOD(pci_set_powerstate, pci_set_powerstate_method),
> DEVMETHOD(pci_assign_interrupt, pci_assign_interrupt_method),
> DEVMETHOD(pci_find_extcap, pci_find_extcap_method),
> +#ifdef MSI
> DEVMETHOD(pci_alloc_msi, pci_alloc_msi_method),
> DEVMETHOD(pci_alloc_msix, pci_alloc_msix_method),
> DEVMETHOD(pci_remap_msix, pci_remap_msix_method),
> DEVMETHOD(pci_release_msi, pci_release_msi_method),
> DEVMETHOD(pci_msi_count, pci_msi_count_method),
> DEVMETHOD(pci_msix_count, pci_msix_count_method),
> +#endif
>
> { 0, 0 }
> };
> @@ -191,6 +195,7 @@
> /* As does the Serverworks OSB4 (the SMBus mapping register) */
> { 0x02001166, PCI_QUIRK_MAP_REG, 0x90, 0 },
>
> +#ifdef MSI
> /*
> * MSI doesn't work with the ServerWorks CNB20-HE Host Bridge
> * or the CMIC-SL (AKA ServerWorks GC_LE).
> @@ -215,7 +220,7 @@
> * bridge.
> */
> { 0x74501022, PCI_QUIRK_DISABLE_MSI, 0, 0 },
> -
> +#endif
> { 0 }
> };
>
> @@ -255,6 +260,7 @@
> &pci_do_power_resume, 1,
> "Transition from D3 -> D0 on resume.");
>
> +#ifdef MSI
> static int pci_do_msi = 1;
> TUNABLE_INT("hw.pci.enable_msi", &pci_do_msi);
> SYSCTL_INT(_hw_pci, OID_AUTO, enable_msi, CTLFLAG_RW, &pci_do_msi, 1,
> @@ -269,6 +275,7 @@
> TUNABLE_INT("hw.pci.honor_msi_blacklist", &pci_honor_msi_blacklist);
> SYSCTL_INT(_hw_pci, OID_AUTO, honor_msi_blacklist, CTLFLAG_RD,
> &pci_honor_msi_blacklist, 1, "Honor chipset blacklist for MSI");
> +#endif
>
> /* Find a device_t by bus/slot/function in domain 0 */
>
> @@ -544,6 +551,7 @@
> cfg->pp.pp_data = ptr + PCIR_POWER_DATA;
> }
> break;
> +#ifdef MSI
> #if defined(__i386__) || defined(__amd64__)
> case PCIY_HT: /* HyperTransport */
> /* Determine HT-specific capability type. */
> @@ -592,6 +600,7 @@
> PCIM_MSIX_BIR_MASK);
> cfg->msix.msix_pba_offset = val & ~PCIM_MSIX_BIR_MASK;
> break;
> +#endif
> case PCIY_VPD: /* PCI Vital Product Data */
> cfg->vpd.vpd_reg = ptr;
> break;
> @@ -1081,6 +1090,7 @@
> return (ENOENT);
> }
>
> +#ifdef MSI
> /*
> * Support for MSI-X message interrupts.
> */
> @@ -1914,6 +1924,7 @@
> return (msi->msi_msgnum);
> return (0);
> }
> +#endif
>
> /* free pcicfgregs structure and all depending data structures */
>
> @@ -2194,6 +2205,7 @@
> cfg->pp.pp_cap & PCIM_PCAP_D2SUPP ? " D2" : "",
> status & PCIM_PSTAT_DMASK);
> }
> +#ifdef MSI
> if (cfg->msi.msi_location) {
> int ctrl;
>
> @@ -2216,6 +2228,7 @@
> cfg->msix.msix_table_bar,
> cfg->msix.msix_pba_bar);
> }
> +#endif
> }
> }
>
> @@ -2744,19 +2757,23 @@
> pci_setup_intr(device_t dev, device_t child, struct resource *irq, int
> flags, driver_filter_t *filter, driver_intr_t *intr, void *arg, void
> **cookiep) {
> +#ifdef MSI
> struct pci_devinfo *dinfo;
> struct msix_table_entry *mte;
> struct msix_vector *mv;
> + int rid;
> uint64_t addr;
> uint32_t data;
> +#endif
> void *cookie;
> - int error, rid;
> + int error;
>
> error = bus_generic_setup_intr(dev, child, irq, flags, filter, intr,
> arg, &cookie);
> if (error)
> return (error);
>
> +#ifdef MSI
> /*
> * If this is a direct child, check to see if the interrupt is
> * MSI or MSI-X. If so, ask our parent to map the MSI and give
> @@ -2813,6 +2830,7 @@
> return (error);
> }
> }
> +#endif
> *cookiep = cookie;
> return (0);
> }
> @@ -2821,9 +2839,11 @@
> pci_teardown_intr(device_t dev, device_t child, struct resource *irq,
> void *cookie)
> {
> +#ifdef MSI
> struct msix_table_entry *mte;
> + struct pci_devinfo *dinfo;
> struct resource_list_entry *rle;
> - struct pci_devinfo *dinfo;
> +#endif
> int error, rid;
>
> /*
> @@ -2834,6 +2854,7 @@
> */
> if (irq == NULL || !(rman_get_flags(irq) & RF_ACTIVE))
> return (EINVAL);
> +#ifdef MSI
> rid = rman_get_rid(irq);
> if (device_get_parent(child) == dev && rid > 0) {
> dinfo = device_get_ivars(child);
> @@ -2861,6 +2882,7 @@
> pci_mask_msix(child, rid - 1);
> }
> }
> +#endif
> error = bus_generic_teardown_intr(dev, child, irq, cookie);
> if (device_get_parent(child) == dev && rid > 0)
> KASSERT(error == 0,
> @@ -2900,6 +2922,7 @@
> int subclass;
> char *desc;
> } pci_nomatch_tab[] = {
> +#if 0
> {PCIC_OLD, -1, "old"},
> {PCIC_OLD, PCIS_OLD_NONVGA, "non-VGA display device"},
> {PCIC_OLD, PCIS_OLD_VGA, "VGA-compatible display device"},
> @@ -2978,6 +3001,7 @@
> {PCIC_CRYPTO, PCIS_CRYPTO_ENTERTAIN, "entertainment crypto"},
> {PCIC_DASP, -1, "dasp"},
> {PCIC_DASP, PCIS_DASP_DPIO, "DPIO module"},
> +#endif
> {0, 0, NULL}
> };
>
> @@ -3667,11 +3691,13 @@
> pci_write_config(dev, PCIR_PROGIF, dinfo->cfg.progif, 1);
> pci_write_config(dev, PCIR_REVID, dinfo->cfg.revid, 1);
>
> +#ifdef MSI
> /* Restore MSI and MSI-X configurations if they are present. */
> if (dinfo->cfg.msi.msi_location != 0)
> pci_resume_msi(dev);
> if (dinfo->cfg.msix.msix_location != 0)
> pci_resume_msix(dev);
> +#endif
> }
>
> void
>
> ==== //depot/projects/arm/src/sys/dev/pci/pci_pci.c#14 (text+ko) ====
>
> @@ -79,11 +79,13 @@
> DEVMETHOD(pcib_read_config, pcib_read_config),
> DEVMETHOD(pcib_write_config, pcib_write_config),
> DEVMETHOD(pcib_route_interrupt, pcib_route_interrupt),
> +#ifdef MSI
> DEVMETHOD(pcib_alloc_msi, pcib_alloc_msi),
> DEVMETHOD(pcib_release_msi, pcib_release_msi),
> DEVMETHOD(pcib_alloc_msix, pcib_alloc_msix),
> DEVMETHOD(pcib_release_msix, pcib_release_msix),
> DEVMETHOD(pcib_map_msi, pcib_map_msi),
> +#endif
>
> { 0, 0 }
> };
> @@ -242,8 +244,10 @@
> }
> }
>
> +#ifdef MSI
> if (pci_msi_device_blacklisted(dev))
> sc->flags |= PCIB_DISABLE_MSI;
> +#endif
>
> /*
> * Intel 815, 845 and other chipsets say they are PCI-PCI bridges,
> @@ -554,6 +558,7 @@
> return(intnum);
> }
>
> +#ifdef MSI
> /* Pass request to alloc MSI/MSI-X messages up to the parent bridge. */
> int
> pcib_alloc_msi(device_t pcib, device_t dev, int count, int maxcount, int
> *irqs) @@ -611,6 +616,7 @@
> bus = device_get_parent(pcib);
> return (PCIB_MAP_MSI(device_get_parent(bus), dev, irq, addr, data));
> }
> +#endif
>
> /*
> * Try to read the bus number of a host-PCI bridge using appropriate
> config
--
John Baldwin
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 15:06:17 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C38DB1065689; Fri, 25 Apr 2008 15:06:17 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 859801065680
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 15:06:17 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 5B1E28FC33
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 15:06:17 +0000 (UTC)
(envelope-from gonzo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PF6Hj3040888
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 15:06:17 GMT
(envelope-from gonzo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PF6HsR040886
for perforce@freebsd.org; Fri, 25 Apr 2008 15:06:17 GMT
(envelope-from gonzo@FreeBSD.org)
Date: Fri, 25 Apr 2008 15:06:17 GMT
Message-Id: <200804251506.m3PF6HsR040886@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gonzo@FreeBSD.org using -f
From: Oleksandr Tymoshenko <gonzo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140612 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 15:06:18 -0000
http://perforce.freebsd.org/chv.cgi?CH=140612
Change 140612 by gonzo@gonzo_jeeves on 2008/04/25 15:06:06
o NO_DMA is not required any more. MALTA/gxemul problem has been
tracked down to gxemul handling of PCI CMD register. Enabling
busmastering does not affects it's value in any way. Thats why
r_res1 ended up with NULL value around ata-pci.c:216. Patch for
GXemul will be provided and sent to gxemul author a bit later.
Affected files ...
.. //depot/projects/mips2-jnpr/src/sys/mips/mips/busdma_machdep.c#5 edit
Differences ...
==== //depot/projects/mips2-jnpr/src/sys/mips/mips/busdma_machdep.c#5 (text+ko) ====
@@ -25,8 +25,6 @@
*
*/
-#define NO_DMA
-
/*-
* Copyright (c) 1997, 1998, 2001 The NetBSD Foundation, Inc.
* All rights reserved.
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 16:31:50 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 17AF01065674; Fri, 25 Apr 2008 16:31:50 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C94EB1065670
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 16:31:49 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 9FBAA8FC14
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 16:31:49 +0000 (UTC)
(envelope-from rpaulo@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PGVnUS049164
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 16:31:49 GMT
(envelope-from rpaulo@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PGVlck049162
for perforce@freebsd.org; Fri, 25 Apr 2008 16:31:47 GMT
(envelope-from rpaulo@FreeBSD.org)
Date: Fri, 25 Apr 2008 16:31:47 GMT
Message-Id: <200804251631.m3PGVlck049162@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
rpaulo@FreeBSD.org using -f
From: Rui Paulo <rpaulo@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140618 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 16:31:50 -0000
http://perforce.freebsd.org/chv.cgi?CH=140618
Change 140618 by rpaulo@rpaulo_zoo on 2008/04/25 16:31:23
IFC
Affected files ...
.. //depot/projects/tcpecn/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/tcpecn/amd64/amd64/machdep.c#4 integrate
.. //depot/projects/tcpecn/amd64/amd64/pmap.c#7 integrate
.. //depot/projects/tcpecn/amd64/conf/GENERIC#7 integrate
.. //depot/projects/tcpecn/amd64/conf/NOTES#6 integrate
.. //depot/projects/tcpecn/amd64/include/clock.h#3 integrate
.. //depot/projects/tcpecn/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/tcpecn/amd64/include/pcb_ext.h#2 delete
.. //depot/projects/tcpecn/amd64/include/pcpu.h#2 integrate
.. //depot/projects/tcpecn/amd64/isa/clock.c#4 integrate
.. //depot/projects/tcpecn/amd64/linux32/linux.h#2 integrate
.. //depot/projects/tcpecn/amd64/linux32/linux32_dummy.c#2 integrate
.. //depot/projects/tcpecn/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/tcpecn/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/tcpecn/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/tcpecn/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/tcpecn/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/tcpecn/arm/arm/bus_space_generic.c#1 branch
.. //depot/projects/tcpecn/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/tcpecn/arm/arm/exception.S#2 integrate
.. //depot/projects/tcpecn/arm/arm/intr.c#3 integrate
.. //depot/projects/tcpecn/arm/arm/locore.S#3 integrate
.. //depot/projects/tcpecn/arm/arm/machdep.c#3 integrate
.. //depot/projects/tcpecn/arm/at91/at91.c#3 integrate
.. //depot/projects/tcpecn/arm/at91/kb920x_machdep.c#3 integrate
.. //depot/projects/tcpecn/arm/conf/AVILA#4 integrate
.. //depot/projects/tcpecn/arm/conf/BWCT#4 integrate
.. //depot/projects/tcpecn/arm/conf/CRB#4 integrate
.. //depot/projects/tcpecn/arm/conf/EP80219#4 integrate
.. //depot/projects/tcpecn/arm/conf/HL200#4 integrate
.. //depot/projects/tcpecn/arm/conf/IQ31244#4 integrate
.. //depot/projects/tcpecn/arm/conf/KB920X#4 integrate
.. //depot/projects/tcpecn/arm/conf/SIMICS#4 integrate
.. //depot/projects/tcpecn/arm/conf/SKYEYE#4 integrate
.. //depot/projects/tcpecn/arm/include/intr.h#2 integrate
.. //depot/projects/tcpecn/arm/include/machdep.h#2 integrate
.. //depot/projects/tcpecn/arm/sa11x0/assabet_machdep.c#2 integrate
.. //depot/projects/tcpecn/arm/sa11x0/files.sa11x0#3 integrate
.. //depot/projects/tcpecn/arm/sa11x0/sa11x0_io.c#2 integrate
.. //depot/projects/tcpecn/arm/sa11x0/sa11x0_ost.c#2 integrate
.. //depot/projects/tcpecn/arm/xscale/i80321/ep80219_machdep.c#2 integrate
.. //depot/projects/tcpecn/arm/xscale/i80321/files.ep80219#2 integrate
.. //depot/projects/tcpecn/arm/xscale/i80321/files.i80219#2 integrate
.. //depot/projects/tcpecn/arm/xscale/i80321/files.i80321#2 integrate
.. //depot/projects/tcpecn/arm/xscale/i80321/files.iq31244#2 integrate
.. //depot/projects/tcpecn/arm/xscale/i80321/iq31244_machdep.c#2 integrate
.. //depot/projects/tcpecn/arm/xscale/i80321/obio_space.c#2 integrate
.. //depot/projects/tcpecn/arm/xscale/i8134x/crb_machdep.c#3 integrate
.. //depot/projects/tcpecn/arm/xscale/i8134x/files.i81342#2 integrate
.. //depot/projects/tcpecn/arm/xscale/i8134x/obio_space.c#2 integrate
.. //depot/projects/tcpecn/arm/xscale/ixp425/avila_machdep.c#2 integrate
.. //depot/projects/tcpecn/arm/xscale/ixp425/files.avila#2 integrate
.. //depot/projects/tcpecn/arm/xscale/ixp425/files.ixp425#2 integrate
.. //depot/projects/tcpecn/arm/xscale/ixp425/ixp425_a4x_space.c#2 integrate
.. //depot/projects/tcpecn/arm/xscale/ixp425/ixp425_space.c#2 integrate
.. //depot/projects/tcpecn/boot/forth/loader.conf#3 integrate
.. //depot/projects/tcpecn/boot/i386/pxeldr/pxeldr.S#3 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/acl.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/bitmap.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/callb.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cpupart.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/dkio.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/objfs.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/tcpecn/cddl/compat/opensolaris/sys/taskq_impl.h#2 integrate
.. //depot/projects/tcpecn/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch
.. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate
.. //depot/projects/tcpecn/compat/linux/linux_file.c#5 integrate
.. //depot/projects/tcpecn/compat/linux/linux_file.h#1 branch
.. //depot/projects/tcpecn/compat/linux/linux_misc.c#5 integrate
.. //depot/projects/tcpecn/compat/linux/linux_stats.c#3 integrate
.. //depot/projects/tcpecn/compat/linux/linux_util.c#3 integrate
.. //depot/projects/tcpecn/compat/linux/linux_util.h#2 integrate
.. //depot/projects/tcpecn/compat/svr4/svr4_misc.c#3 integrate
.. //depot/projects/tcpecn/compat/svr4/svr4_sysvec.c#3 integrate
.. //depot/projects/tcpecn/conf/Makefile.arm#3 integrate
.. //depot/projects/tcpecn/conf/Makefile.mips#1 branch
.. //depot/projects/tcpecn/conf/NOTES#8 integrate
.. //depot/projects/tcpecn/conf/files#8 integrate
.. //depot/projects/tcpecn/conf/files.amd64#4 integrate
.. //depot/projects/tcpecn/conf/files.i386#4 integrate
.. //depot/projects/tcpecn/conf/files.mips#1 branch
.. //depot/projects/tcpecn/conf/files.pc98#3 integrate
.. //depot/projects/tcpecn/conf/ldscript.mips#1 branch
.. //depot/projects/tcpecn/conf/ldscript.mips.cfe#1 branch
.. //depot/projects/tcpecn/conf/options#8 integrate
.. //depot/projects/tcpecn/conf/options.mips#1 branch
.. //depot/projects/tcpecn/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/tcpecn/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/tcpecn/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/tcpecn/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/tcpecn/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/tcpecn/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/tcpecn/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/tcpecn/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/tcpecn/ddb/db_capture.c#3 integrate
.. //depot/projects/tcpecn/dev/aac/aac_disk.c#3 integrate
.. //depot/projects/tcpecn/dev/acpi_support/acpi_asus.c#2 integrate
.. //depot/projects/tcpecn/dev/acpi_support/acpi_ibm.c#2 integrate
.. //depot/projects/tcpecn/dev/acpica/Osd/OsdSynch.c#2 integrate
.. //depot/projects/tcpecn/dev/acpica/acpi.c#4 integrate
.. //depot/projects/tcpecn/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/tcpecn/dev/asmc/asmc.c#2 integrate
.. //depot/projects/tcpecn/dev/asmc/asmcvar.h#2 integrate
.. //depot/projects/tcpecn/dev/ata/ata-all.c#3 integrate
.. //depot/projects/tcpecn/dev/ata/ata-all.h#5 integrate
.. //depot/projects/tcpecn/dev/ata/ata-card.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/ata-cbus.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/ata-chipset.c#5 integrate
.. //depot/projects/tcpecn/dev/ata/ata-disk.c#4 integrate
.. //depot/projects/tcpecn/dev/ata/ata-disk.h#3 integrate
.. //depot/projects/tcpecn/dev/ata/ata-dma.c#3 integrate
.. //depot/projects/tcpecn/dev/ata/ata-isa.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/tcpecn/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/tcpecn/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/tcpecn/dev/ata/ata-raid.h#2 integrate
.. //depot/projects/tcpecn/dev/ata/ata-usb.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/ata_if.m#2 integrate
.. //depot/projects/tcpecn/dev/ata/atapi-cam.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/tcpecn/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/atapi-fd.h#2 integrate
.. //depot/projects/tcpecn/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/tcpecn/dev/ata/atapi-tape.h#2 integrate
.. //depot/projects/tcpecn/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/tcpecn/dev/ath/ah_osdep.h#2 integrate
.. //depot/projects/tcpecn/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/tcpecn/dev/ath/ath_rate/amrr/amrr.h#2 integrate
.. //depot/projects/tcpecn/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/tcpecn/dev/ath/ath_rate/onoe/onoe.h#2 integrate
.. //depot/projects/tcpecn/dev/ath/ath_rate/sample/sample.c#2 integrate
.. //depot/projects/tcpecn/dev/ath/ath_rate/sample/sample.h#2 integrate
.. //depot/projects/tcpecn/dev/ath/if_ath.c#4 integrate
.. //depot/projects/tcpecn/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/tcpecn/dev/ath/if_athioctl.h#2 integrate
.. //depot/projects/tcpecn/dev/ath/if_athrate.h#2 integrate
.. //depot/projects/tcpecn/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/tcpecn/dev/atkbdc/psm.c#3 integrate
.. //depot/projects/tcpecn/dev/awi/am79c930.c#2 delete
.. //depot/projects/tcpecn/dev/awi/am79c930reg.h#2 delete
.. //depot/projects/tcpecn/dev/awi/am79c930var.h#2 delete
.. //depot/projects/tcpecn/dev/awi/awi.c#2 delete
.. //depot/projects/tcpecn/dev/awi/awireg.h#2 delete
.. //depot/projects/tcpecn/dev/awi/awivar.h#2 delete
.. //depot/projects/tcpecn/dev/awi/if_awi_pccard.c#2 delete
.. //depot/projects/tcpecn/dev/bce/if_bce.c#3 integrate
.. //depot/projects/tcpecn/dev/bce/if_bcefw.h#3 integrate
.. //depot/projects/tcpecn/dev/bce/if_bcereg.h#3 integrate
.. //depot/projects/tcpecn/dev/bge/if_bge.c#5 integrate
.. //depot/projects/tcpecn/dev/cxgb/cxgb_l2t.c#5 delete
.. //depot/projects/tcpecn/dev/cxgb/cxgb_l2t.h#4 delete
.. //depot/projects/tcpecn/dev/cxgb/cxgb_main.c#6 integrate
.. //depot/projects/tcpecn/dev/cxgb/cxgb_offload.c#4 integrate
.. //depot/projects/tcpecn/dev/cxgb/cxgb_offload.h#4 integrate
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_cpl_io.c#4 integrate
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#5 integrate
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_defs.h#4 integrate
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_listen.c#3 integrate
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#3 integrate
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_tom.c#3 integrate
.. //depot/projects/tcpecn/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#3 integrate
.. //depot/projects/tcpecn/dev/de/if_de.c#2 integrate
.. //depot/projects/tcpecn/dev/em/e1000_80003es2lan.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_82540.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_82541.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_82542.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_82543.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_82571.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_82571.h#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_api.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_api.h#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_defines.h#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_hw.h#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_ich8lan.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_ich8lan.h#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_mac.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_mac.h#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_manage.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_nvm.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_nvm.h#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_osdep.c#1 branch
.. //depot/projects/tcpecn/dev/em/e1000_osdep.h#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_phy.c#3 integrate
.. //depot/projects/tcpecn/dev/em/e1000_phy.h#3 integrate
.. //depot/projects/tcpecn/dev/em/if_em.c#4 integrate
.. //depot/projects/tcpecn/dev/em/if_em.h#4 integrate
.. //depot/projects/tcpecn/dev/fb/vga.c#3 integrate
.. //depot/projects/tcpecn/dev/hme/if_hme.c#2 integrate
.. //depot/projects/tcpecn/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/tcpecn/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/tcpecn/dev/hme/if_hmereg.h#2 integrate
.. //depot/projects/tcpecn/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/tcpecn/dev/ieee488/ibfoo.c#2 integrate
.. //depot/projects/tcpecn/dev/if_ndis/if_ndis.c#4 integrate
.. //depot/projects/tcpecn/dev/if_ndis/if_ndisvar.h#3 integrate
.. //depot/projects/tcpecn/dev/igb/e1000_mac.c#2 integrate
.. //depot/projects/tcpecn/dev/igb/e1000_osdep.c#1 branch
.. //depot/projects/tcpecn/dev/igb/if_igb.c#2 integrate
.. //depot/projects/tcpecn/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/tcpecn/dev/ipw/if_ipwvar.h#2 integrate
.. //depot/projects/tcpecn/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/tcpecn/dev/iwi/if_iwi.c#3 integrate
.. //depot/projects/tcpecn/dev/iwi/if_iwivar.h#2 integrate
.. //depot/projects/tcpecn/dev/k8temp/k8temp.c#1 branch
.. //depot/projects/tcpecn/dev/malo/if_malo.c#2 integrate
.. //depot/projects/tcpecn/dev/malo/if_malo.h#2 integrate
.. //depot/projects/tcpecn/dev/mfi/mfi.c#5 integrate
.. //depot/projects/tcpecn/dev/mii/ip1000phy.c#2 integrate
.. //depot/projects/tcpecn/dev/mii/ip1000phyreg.h#2 integrate
.. //depot/projects/tcpecn/dev/mii/miidevs#4 integrate
.. //depot/projects/tcpecn/dev/mpt/mpt.c#3 integrate
.. //depot/projects/tcpecn/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/tcpecn/dev/nfe/if_nfereg.h#3 integrate
.. //depot/projects/tcpecn/dev/nvram/nvram.c#2 integrate
.. //depot/projects/tcpecn/dev/pci/pcivar.h#2 integrate
.. //depot/projects/tcpecn/dev/ral/if_ral_pci.c#2 integrate
.. //depot/projects/tcpecn/dev/ral/if_ralrate.c#2 delete
.. //depot/projects/tcpecn/dev/ral/if_ralrate.h#2 delete
.. //depot/projects/tcpecn/dev/ral/rt2560.c#3 integrate
.. //depot/projects/tcpecn/dev/ral/rt2560reg.h#3 integrate
.. //depot/projects/tcpecn/dev/ral/rt2560var.h#3 integrate
.. //depot/projects/tcpecn/dev/ral/rt2661.c#2 integrate
.. //depot/projects/tcpecn/dev/ral/rt2661_ucode.h#2 delete
.. //depot/projects/tcpecn/dev/ral/rt2661var.h#2 integrate
.. //depot/projects/tcpecn/dev/re/if_re.c#6 integrate
.. //depot/projects/tcpecn/dev/sound/midi/mpu401.c#2 integrate
.. //depot/projects/tcpecn/dev/sound/pci/hda/hdac.c#4 integrate
.. //depot/projects/tcpecn/dev/sound/pcm/dsp.c#2 integrate
.. //depot/projects/tcpecn/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/tcpecn/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/tcpecn/dev/usb/if_aue.c#2 integrate
.. //depot/projects/tcpecn/dev/usb/if_rum.c#4 integrate
.. //depot/projects/tcpecn/dev/usb/if_rumvar.h#2 integrate
.. //depot/projects/tcpecn/dev/usb/if_ural.c#2 integrate
.. //depot/projects/tcpecn/dev/usb/if_uralvar.h#2 integrate
.. //depot/projects/tcpecn/dev/usb/if_zyd.c#5 integrate
.. //depot/projects/tcpecn/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/tcpecn/dev/usb/ubsa.c#4 integrate
.. //depot/projects/tcpecn/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/tcpecn/dev/usb/uipaq.c#2 integrate
.. //depot/projects/tcpecn/dev/usb/usbdevs#7 integrate
.. //depot/projects/tcpecn/dev/vx/if_vx.c#2 integrate
.. //depot/projects/tcpecn/dev/wi/if_wavelan_ieee.h#2 integrate
.. //depot/projects/tcpecn/dev/wi/if_wi.c#2 integrate
.. //depot/projects/tcpecn/dev/wi/if_wi_pccard.c#2 integrate
.. //depot/projects/tcpecn/dev/wi/if_wi_pci.c#2 integrate
.. //depot/projects/tcpecn/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/tcpecn/dev/wi/spectrum24t_cf.h#2 delete
.. //depot/projects/tcpecn/dev/wpi/if_wpi.c#6 integrate
.. //depot/projects/tcpecn/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/tcpecn/fs/fdescfs/fdesc_vnops.c#4 integrate
.. //depot/projects/tcpecn/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/tcpecn/fs/msdosfs/msdosfs_vnops.c#4 integrate
.. //depot/projects/tcpecn/fs/smbfs/smbfs_node.h#2 integrate
.. //depot/projects/tcpecn/fs/smbfs/smbfs_vnops.c#3 integrate
.. //depot/projects/tcpecn/fs/tmpfs/tmpfs.h#2 integrate
.. //depot/projects/tcpecn/fs/tmpfs/tmpfs_vfsops.c#4 integrate
.. //depot/projects/tcpecn/fs/tmpfs/tmpfs_vnops.c#6 integrate
.. //depot/projects/tcpecn/fs/unionfs/union.h#2 integrate
.. //depot/projects/tcpecn/fs/unionfs/union_subr.c#5 integrate
.. //depot/projects/tcpecn/fs/unionfs/union_vnops.c#5 integrate
.. //depot/projects/tcpecn/geom/part/g_part.c#4 integrate
.. //depot/projects/tcpecn/geom/part/g_part.h#4 integrate
.. //depot/projects/tcpecn/geom/part/g_part_apm.c#3 integrate
.. //depot/projects/tcpecn/geom/part/g_part_bsd.c#3 integrate
.. //depot/projects/tcpecn/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/tcpecn/geom/part/g_part_if.m#2 integrate
.. //depot/projects/tcpecn/geom/part/g_part_mbr.c#4 integrate
.. //depot/projects/tcpecn/geom/part/g_part_pc98.c#2 integrate
.. //depot/projects/tcpecn/geom/part/g_part_vtoc8.c#3 integrate
.. //depot/projects/tcpecn/gnu/fs/ext2fs/ext2_vnops.c#3 integrate
.. //depot/projects/tcpecn/gnu/fs/ext2fs/inode.h#2 integrate
.. //depot/projects/tcpecn/gnu/fs/xfs/FreeBSD/xfs_vnops.c#3 integrate
.. //depot/projects/tcpecn/i386/bios/apm.c#3 integrate
.. //depot/projects/tcpecn/i386/conf/GENERIC#7 integrate
.. //depot/projects/tcpecn/i386/conf/GENERIC.hints#3 integrate
.. //depot/projects/tcpecn/i386/conf/PAE#3 integrate
.. //depot/projects/tcpecn/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/tcpecn/i386/i386/machdep.c#5 integrate
.. //depot/projects/tcpecn/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/tcpecn/i386/i386/pmap.c#7 integrate
.. //depot/projects/tcpecn/i386/ibcs2/ibcs2_util.c#3 integrate
.. //depot/projects/tcpecn/i386/include/clock.h#3 integrate
.. //depot/projects/tcpecn/i386/include/cpufunc.h#2 integrate
.. //depot/projects/tcpecn/i386/include/pcpu.h#2 integrate
.. //depot/projects/tcpecn/i386/isa/clock.c#4 integrate
.. //depot/projects/tcpecn/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/tcpecn/i386/linux/linux.h#2 integrate
.. //depot/projects/tcpecn/i386/linux/linux_dummy.c#2 integrate
.. //depot/projects/tcpecn/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/tcpecn/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/tcpecn/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/tcpecn/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/tcpecn/i386/linux/syscalls.master#3 integrate
.. //depot/projects/tcpecn/ia64/conf/DEFAULTS#4 integrate
.. //depot/projects/tcpecn/ia64/conf/GENERIC#6 integrate
.. //depot/projects/tcpecn/ia64/conf/SKI#2 integrate
.. //depot/projects/tcpecn/ia64/ia64/clock.c#2 integrate
.. //depot/projects/tcpecn/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/tcpecn/ia64/ia64/machdep.c#5 integrate
.. //depot/projects/tcpecn/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/tcpecn/ia64/ia64/nexus.c#3 integrate
.. //depot/projects/tcpecn/ia64/ia64/pmap.c#5 integrate
.. //depot/projects/tcpecn/ia64/ia64/sapic.c#2 integrate
.. //depot/projects/tcpecn/ia64/ia64/sscdisk.c#3 integrate
.. //depot/projects/tcpecn/ia64/include/vmparam.h#3 integrate
.. //depot/projects/tcpecn/isa/atrtc.c#1 branch
.. //depot/projects/tcpecn/isa/rtc.h#2 integrate
.. //depot/projects/tcpecn/kern/kern_cpuset.c#3 integrate
.. //depot/projects/tcpecn/kern/kern_descrip.c#8 integrate
.. //depot/projects/tcpecn/kern/kern_intr.c#3 integrate
.. //depot/projects/tcpecn/kern/kern_jail.c#5 integrate
.. //depot/projects/tcpecn/kern/kern_linker.c#5 integrate
.. //depot/projects/tcpecn/kern/kern_lock.c#7 integrate
.. //depot/projects/tcpecn/kern/kern_lockf.c#3 integrate
.. //depot/projects/tcpecn/kern/kern_mbuf.c#5 integrate
.. //depot/projects/tcpecn/kern/kern_rwlock.c#7 integrate
.. //depot/projects/tcpecn/kern/kern_subr.c#2 integrate
.. //depot/projects/tcpecn/kern/kern_switch.c#3 integrate
.. //depot/projects/tcpecn/kern/kern_synch.c#4 integrate
.. //depot/projects/tcpecn/kern/kern_thread.c#5 integrate
.. //depot/projects/tcpecn/kern/kern_timeout.c#4 integrate
.. //depot/projects/tcpecn/kern/kern_umtx.c#4 integrate
.. //depot/projects/tcpecn/kern/sched_4bsd.c#5 integrate
.. //depot/projects/tcpecn/kern/sched_ule.c#7 integrate
.. //depot/projects/tcpecn/kern/subr_clock.c#2 integrate
.. //depot/projects/tcpecn/kern/subr_firmware.c#2 integrate
.. //depot/projects/tcpecn/kern/subr_rtc.c#2 integrate
.. //depot/projects/tcpecn/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/tcpecn/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/tcpecn/kern/subr_trap.c#4 integrate
.. //depot/projects/tcpecn/kern/subr_turnstile.c#3 integrate
.. //depot/projects/tcpecn/kern/subr_witness.c#4 integrate
.. //depot/projects/tcpecn/kern/tty.c#4 integrate
.. //depot/projects/tcpecn/kern/uipc_shm.c#4 integrate
.. //depot/projects/tcpecn/kern/uipc_socket.c#4 integrate
.. //depot/projects/tcpecn/kern/vfs_cache.c#5 integrate
.. //depot/projects/tcpecn/kern/vfs_default.c#6 integrate
.. //depot/projects/tcpecn/kern/vfs_lookup.c#5 integrate
.. //depot/projects/tcpecn/kern/vfs_mount.c#7 integrate
.. //depot/projects/tcpecn/kern/vfs_subr.c#8 integrate
.. //depot/projects/tcpecn/kern/vfs_syscalls.c#7 integrate
.. //depot/projects/tcpecn/mips/compile/.cvsignore#1 branch
.. //depot/projects/tcpecn/mips/conf/ADM5120#1 branch
.. //depot/projects/tcpecn/mips/conf/ADM5120.hints#1 branch
.. //depot/projects/tcpecn/mips/conf/IDT#1 branch
.. //depot/projects/tcpecn/mips/conf/IDT.hints#1 branch
.. //depot/projects/tcpecn/mips/conf/MALTA#1 branch
.. //depot/projects/tcpecn/mips/conf/MALTA.hints#1 branch
.. //depot/projects/tcpecn/mips/conf/QEMU#1 branch
.. //depot/projects/tcpecn/mips/conf/SENTRY5#1 branch
.. //depot/projects/tcpecn/mips/conf/SENTRY5.hints#1 branch
.. //depot/projects/tcpecn/mips/include/_bus.h#1 branch
.. //depot/projects/tcpecn/mips/include/_bus_octeon.h#1 branch
.. //depot/projects/tcpecn/mips/include/_inttypes.h#1 branch
.. //depot/projects/tcpecn/mips/include/_limits.h#1 branch
.. //depot/projects/tcpecn/mips/include/_stdint.h#1 branch
.. //depot/projects/tcpecn/mips/include/_types.h#1 branch
.. //depot/projects/tcpecn/mips/include/am29lv081b.h#1 branch
.. //depot/projects/tcpecn/mips/include/archtype.h#1 branch
.. //depot/projects/tcpecn/mips/include/asm.h#1 branch
.. //depot/projects/tcpecn/mips/include/asmacros.h#1 branch
.. //depot/projects/tcpecn/mips/include/atomic.h#1 branch
.. //depot/projects/tcpecn/mips/include/bootinfo.h#1 branch
.. //depot/projects/tcpecn/mips/include/bswap.h#1 branch
.. //depot/projects/tcpecn/mips/include/bus.h#1 branch
.. //depot/projects/tcpecn/mips/include/bus_dma.h#1 branch
.. //depot/projects/tcpecn/mips/include/bus_octeon.h#1 branch
.. //depot/projects/tcpecn/mips/include/cache.h#1 branch
.. //depot/projects/tcpecn/mips/include/cache_mipsNN.h#1 branch
.. //depot/projects/tcpecn/mips/include/cache_r4k.h#1 branch
.. //depot/projects/tcpecn/mips/include/clock.h#1 branch
.. //depot/projects/tcpecn/mips/include/clockvar.h#1 branch
.. //depot/projects/tcpecn/mips/include/cp0.h#1 branch
.. //depot/projects/tcpecn/mips/include/cpu.h#1 branch
.. //depot/projects/tcpecn/mips/include/cpufunc.h#1 branch
.. //depot/projects/tcpecn/mips/include/cpuinfo.h#1 branch
.. //depot/projects/tcpecn/mips/include/cpuregs.h#1 branch
.. //depot/projects/tcpecn/mips/include/cputypes.h#1 branch
.. //depot/projects/tcpecn/mips/include/db_machdep.h#1 branch
.. //depot/projects/tcpecn/mips/include/defs.h#1 branch
.. //depot/projects/tcpecn/mips/include/elf.h#1 branch
.. //depot/projects/tcpecn/mips/include/endian.h#1 branch
.. //depot/projects/tcpecn/mips/include/exec.h#1 branch
.. //depot/projects/tcpecn/mips/include/float.h#1 branch
.. //depot/projects/tcpecn/mips/include/floatingpoint.h#1 branch
.. //depot/projects/tcpecn/mips/include/fpu.h#1 branch
.. //depot/projects/tcpecn/mips/include/frame.h#1 branch
.. //depot/projects/tcpecn/mips/include/gdb_machdep.h#1 branch
.. //depot/projects/tcpecn/mips/include/hwfunc.h#1 branch
.. //depot/projects/tcpecn/mips/include/ieee.h#1 branch
.. //depot/projects/tcpecn/mips/include/ieeefp.h#1 branch
.. //depot/projects/tcpecn/mips/include/in_cksum.h#1 branch
.. //depot/projects/tcpecn/mips/include/intr.h#1 branch
.. //depot/projects/tcpecn/mips/include/intr_machdep.h#1 branch
.. //depot/projects/tcpecn/mips/include/iodev.h#1 branch
.. //depot/projects/tcpecn/mips/include/kdb.h#1 branch
.. //depot/projects/tcpecn/mips/include/limits.h#1 branch
.. //depot/projects/tcpecn/mips/include/locore.h#1 branch
.. //depot/projects/tcpecn/mips/include/md_var.h#1 branch
.. //depot/projects/tcpecn/mips/include/memdev.h#1 branch
.. //depot/projects/tcpecn/mips/include/metadata.h#1 branch
.. //depot/projects/tcpecn/mips/include/minidump.h#1 branch
.. //depot/projects/tcpecn/mips/include/mips_opcode.h#1 branch
.. //depot/projects/tcpecn/mips/include/mp_watchdog.h#1 branch
.. //depot/projects/tcpecn/mips/include/mutex.h#1 branch
.. //depot/projects/tcpecn/mips/include/param.h#1 branch
.. //depot/projects/tcpecn/mips/include/pcb.h#1 branch
.. //depot/projects/tcpecn/mips/include/pci_cfgreg.h#1 branch
.. //depot/projects/tcpecn/mips/include/pcpu.h#1 branch
.. //depot/projects/tcpecn/mips/include/pltfm.h#1 branch
.. //depot/projects/tcpecn/mips/include/pmap.h#1 branch
.. //depot/projects/tcpecn/mips/include/pmc_mdep.h#1 branch
.. //depot/projects/tcpecn/mips/include/ppireg.h#1 branch
.. //depot/projects/tcpecn/mips/include/proc.h#1 branch
.. //depot/projects/tcpecn/mips/include/profile.h#1 branch
.. //depot/projects/tcpecn/mips/include/psl.h#1 branch
.. //depot/projects/tcpecn/mips/include/pte.h#1 branch
.. //depot/projects/tcpecn/mips/include/ptrace.h#1 branch
.. //depot/projects/tcpecn/mips/include/queue.h#1 branch
.. //depot/projects/tcpecn/mips/include/reg.h#1 branch
.. //depot/projects/tcpecn/mips/include/regdef.h#1 branch
.. //depot/projects/tcpecn/mips/include/regnum.h#1 branch
.. //depot/projects/tcpecn/mips/include/reloc.h#1 branch
.. //depot/projects/tcpecn/mips/include/resource.h#1 branch
.. //depot/projects/tcpecn/mips/include/rm7000.h#1 branch
.. //depot/projects/tcpecn/mips/include/runq.h#1 branch
.. //depot/projects/tcpecn/mips/include/segments.h#1 branch
.. //depot/projects/tcpecn/mips/include/setjmp.h#1 branch
.. //depot/projects/tcpecn/mips/include/sf_buf.h#1 branch
.. //depot/projects/tcpecn/mips/include/sigframe.h#1 branch
.. //depot/projects/tcpecn/mips/include/signal.h#1 branch
.. //depot/projects/tcpecn/mips/include/smp.h#1 branch
.. //depot/projects/tcpecn/mips/include/stdarg.h#1 branch
.. //depot/projects/tcpecn/mips/include/sysarch.h#1 branch
.. //depot/projects/tcpecn/mips/include/timerreg.h#1 branch
.. //depot/projects/tcpecn/mips/include/trap.h#1 branch
.. //depot/projects/tcpecn/mips/include/ucontext.h#1 branch
.. //depot/projects/tcpecn/mips/include/varargs.h#1 branch
.. //depot/projects/tcpecn/mips/include/vmparam.h#1 branch
.. //depot/projects/tcpecn/mips/mips/autoconf.c#1 branch
.. //depot/projects/tcpecn/mips/mips/busdma_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/cache.c#1 branch
.. //depot/projects/tcpecn/mips/mips/cache_mipsNN.c#1 branch
.. //depot/projects/tcpecn/mips/mips/copystr.S#1 branch
.. //depot/projects/tcpecn/mips/mips/cpu.c#1 branch
.. //depot/projects/tcpecn/mips/mips/db_disasm.c#1 branch
.. //depot/projects/tcpecn/mips/mips/db_interface.c#1 branch
.. //depot/projects/tcpecn/mips/mips/db_trace.c#1 branch
.. //depot/projects/tcpecn/mips/mips/dump_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/elf_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/exception.S#1 branch
.. //depot/projects/tcpecn/mips/mips/fp.S#1 branch
.. //depot/projects/tcpecn/mips/mips/gdb_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/genassym.c#1 branch
.. //depot/projects/tcpecn/mips/mips/in_cksum.c#1 branch
.. //depot/projects/tcpecn/mips/mips/intr_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/locore.S#1 branch
.. //depot/projects/tcpecn/mips/mips/machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/mainbus.c#1 branch
.. //depot/projects/tcpecn/mips/mips/mem.c#1 branch
.. //depot/projects/tcpecn/mips/mips/mips_subr.c#1 branch
.. //depot/projects/tcpecn/mips/mips/mp_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/nexus.c#1 branch
.. //depot/projects/tcpecn/mips/mips/pm_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/pmap.c#1 branch
.. //depot/projects/tcpecn/mips/mips/psraccess.S#1 branch
.. //depot/projects/tcpecn/mips/mips/stack_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/support.S#1 branch
.. //depot/projects/tcpecn/mips/mips/swtch.S#1 branch
.. //depot/projects/tcpecn/mips/mips/tick.c#1 branch
.. //depot/projects/tcpecn/mips/mips/tlb.S#1 branch
.. //depot/projects/tcpecn/mips/mips/trap.c#1 branch
.. //depot/projects/tcpecn/mips/mips/uio_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips/vm_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/adm5120_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/adm5120reg.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/admpci.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/console.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/files.adm5120#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/if_admsw.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/if_admswreg.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/if_admswvar.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/obio.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/obiovar.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/std.adm5120#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/files.idt#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/idt_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/idtpci.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/idtreg.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/if_kr.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/if_krreg.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/obio.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/obiovar.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/std.idt#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/uart_bus_rc32434.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/idt/uart_cpu_rc32434.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/files.malta#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/gt.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/gt_pci.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/gtreg.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/gtvar.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/malta_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/maltareg.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/obio.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/obiovar.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/std.malta#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/uart_bus_maltausart.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/uart_cpu_maltausart.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/yamon.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/malta/yamon.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/files.sentry5#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/obio.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/obiovar.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/s5_machdep.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/s5reg.h#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/siba_cc.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/siba_mips.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/siba_sdram.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch
.. //depot/projects/tcpecn/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch
.. //depot/projects/tcpecn/modules/Makefile#6 integrate
.. //depot/projects/tcpecn/modules/asmc/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/ath_rate_amrr/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/ath_rate_onoe/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/ath_rate_sample/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/awi/Makefile#2 delete
.. //depot/projects/tcpecn/modules/cxgb/cxgb/Makefile#5 integrate
.. //depot/projects/tcpecn/modules/cxgb/tom/Makefile#3 integrate
.. //depot/projects/tcpecn/modules/em/Makefile#4 integrate
.. //depot/projects/tcpecn/modules/firmware/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/igb/Makefile#3 integrate
.. //depot/projects/tcpecn/modules/k8temp/Makefile#1 branch
.. //depot/projects/tcpecn/modules/malo/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/ral/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/ralfw/Makefile#1 branch
.. //depot/projects/tcpecn/modules/ralfw/Makefile.inc#1 branch
.. //depot/projects/tcpecn/modules/ralfw/rt2561/Makefile#1 branch
.. //depot/projects/tcpecn/modules/ralfw/rt2561s/Makefile#1 branch
.. //depot/projects/tcpecn/modules/ralfw/rt2661/Makefile#1 branch
.. //depot/projects/tcpecn/modules/wlan/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/wlan_acl/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/wlan_amrr/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/wlan_ccmp/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/wlan_rssadapt/Makefile#1 branch
.. //depot/projects/tcpecn/modules/wlan_scan_ap/Makefile#2 delete
.. //depot/projects/tcpecn/modules/wlan_scan_sta/Makefile#2 delete
.. //depot/projects/tcpecn/modules/wlan_tkip/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/wlan_wep/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/wlan_xauth/Makefile#2 integrate
.. //depot/projects/tcpecn/modules/zfs/Makefile#5 integrate
.. //depot/projects/tcpecn/net/bpf.c#5 integrate
.. //depot/projects/tcpecn/net/bpf_zerocopy.c#2 integrate
.. //depot/projects/tcpecn/net/bpf_zerocopy.h#2 integrate
.. //depot/projects/tcpecn/net/if.c#3 integrate
.. //depot/projects/tcpecn/net/if_loop.c#3 integrate
.. //depot/projects/tcpecn/net/if_media.h#3 integrate
.. //depot/projects/tcpecn/net/if_tap.c#2 integrate
.. //depot/projects/tcpecn/net/radix.c#2 integrate
.. //depot/projects/tcpecn/net/radix.h#2 integrate
.. //depot/projects/tcpecn/net/radix_mpath.c#1 branch
.. //depot/projects/tcpecn/net/radix_mpath.h#1 branch
.. //depot/projects/tcpecn/net/route.c#5 integrate
.. //depot/projects/tcpecn/net/route.h#4 integrate
.. //depot/projects/tcpecn/net/rtsock.c#3 integrate
.. //depot/projects/tcpecn/net80211/_ieee80211.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211.c#3 integrate
.. //depot/projects/tcpecn/net80211/ieee80211.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_acl.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_adhoc.c#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_adhoc.h#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_amrr.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_amrr.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_crypto.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_crypto.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_crypto_ccmp.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_crypto_none.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_crypto_tkip.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_crypto_wep.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_ddb.c#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_dfs.c#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_dfs.h#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_freebsd.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_hostap.c#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_hostap.h#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_ht.c#3 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_ht.h#3 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_input.c#3 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_input.h#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_ioctl.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_ioctl.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_monitor.c#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_monitor.h#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_output.c#3 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_phy.c#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_phy.h#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_power.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_power.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_proto.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_regdomain.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_rssadapt.c#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_rssadapt.h#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_scan_ap.c#2 delete
.. //depot/projects/tcpecn/net80211/ieee80211_scan_sta.c#4 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_sta.c#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_sta.h#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/tcpecn/net80211/ieee80211_wds.c#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_wds.h#1 branch
.. //depot/projects/tcpecn/net80211/ieee80211_xauth.c#2 integrate
.. //depot/projects/tcpecn/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate
.. //depot/projects/tcpecn/netgraph/netflow/ng_netflow.c#3 integrate
.. //depot/projects/tcpecn/netgraph/netgraph.h#4 integrate
.. //depot/projects/tcpecn/netgraph/ng_base.c#6 integrate
.. //depot/projects/tcpecn/netinet/in.h#3 integrate
.. //depot/projects/tcpecn/netinet/in_mcast.c#2 integrate
.. //depot/projects/tcpecn/netinet/in_pcb.c#4 integrate
.. //depot/projects/tcpecn/netinet/in_pcb.h#4 integrate
.. //depot/projects/tcpecn/netinet/in_proto.c#2 integrate
.. //depot/projects/tcpecn/netinet/ip_divert.c#2 integrate
.. //depot/projects/tcpecn/netinet/ip_fw2.c#6 integrate
.. //depot/projects/tcpecn/netinet/ip_icmp.c#2 integrate
.. //depot/projects/tcpecn/netinet/ip_input.c#3 integrate
.. //depot/projects/tcpecn/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/tcpecn/netinet/ip_ipsec.h#2 integrate
.. //depot/projects/tcpecn/netinet/ip_options.c#3 integrate
.. //depot/projects/tcpecn/netinet/ip_output.c#4 integrate
.. //depot/projects/tcpecn/netinet/raw_ip.c#2 integrate
.. //depot/projects/tcpecn/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/tcpecn/netinet/sctp_bsd_addr.c#4 integrate
.. //depot/projects/tcpecn/netinet/sctp_bsd_addr.h#2 integrate
.. //depot/projects/tcpecn/netinet/sctp_constants.h#2 integrate
.. //depot/projects/tcpecn/netinet/sctp_indata.c#3 integrate
.. //depot/projects/tcpecn/netinet/sctp_input.c#3 integrate
.. //depot/projects/tcpecn/netinet/sctp_output.c#4 integrate
.. //depot/projects/tcpecn/netinet/sctp_pcb.c#4 integrate
.. //depot/projects/tcpecn/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/tcpecn/netinet/sctp_sysctl.c#2 integrate
.. //depot/projects/tcpecn/netinet/sctp_usrreq.c#3 integrate
.. //depot/projects/tcpecn/netinet/sctp_var.h#2 integrate
.. //depot/projects/tcpecn/netinet/sctputil.c#4 integrate
.. //depot/projects/tcpecn/netinet/sctputil.h#2 integrate
.. //depot/projects/tcpecn/netinet/tcp.h#3 integrate
.. //depot/projects/tcpecn/netinet/tcp_input.c#6 integrate
.. //depot/projects/tcpecn/netinet/tcp_offload.h#2 integrate
.. //depot/projects/tcpecn/netinet/tcp_output.c#5 integrate
.. //depot/projects/tcpecn/netinet/tcp_reass.c#2 integrate
.. //depot/projects/tcpecn/netinet/tcp_sack.c#2 integrate
.. //depot/projects/tcpecn/netinet/tcp_subr.c#4 integrate
.. //depot/projects/tcpecn/netinet/tcp_syncache.c#6 integrate
.. //depot/projects/tcpecn/netinet/tcp_timer.c#2 integrate
.. //depot/projects/tcpecn/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/tcpecn/netinet/tcp_usrreq.c#6 integrate
.. //depot/projects/tcpecn/netinet/tcp_var.h#7 integrate
.. //depot/projects/tcpecn/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/tcpecn/netinet6/icmp6.c#4 integrate
.. //depot/projects/tcpecn/netinet6/in6_pcb.c#4 integrate
.. //depot/projects/tcpecn/netinet6/in6_proto.c#4 integrate
.. //depot/projects/tcpecn/netinet6/in6_src.c#5 integrate
.. //depot/projects/tcpecn/netinet6/nd6_nbr.c#4 integrate
.. //depot/projects/tcpecn/netinet6/raw_ip6.c#5 integrate
.. //depot/projects/tcpecn/netinet6/sctp6_usrreq.c#3 integrate
.. //depot/projects/tcpecn/netinet6/udp6_usrreq.c#5 integrate
.. //depot/projects/tcpecn/nfs4client/nfs4_vnops.c#5 integrate
.. //depot/projects/tcpecn/nfsclient/nfs_lock.c#3 integrate
.. //depot/projects/tcpecn/nfsclient/nfs_vfsops.c#6 integrate
.. //depot/projects/tcpecn/nfsclient/nfs_vnops.c#5 integrate
.. //depot/projects/tcpecn/nfsclient/nfsnode.h#3 integrate
.. //depot/projects/tcpecn/nlm/nlm_prot_impl.c#2 integrate
.. //depot/projects/tcpecn/pc98/cbus/clock.c#3 integrate
.. //depot/projects/tcpecn/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/tcpecn/pc98/cbus/sc_machdep.h#2 integrate
.. //depot/projects/tcpecn/pc98/cbus/syscons_cbus.c#3 integrate
.. //depot/projects/tcpecn/pc98/conf/GENERIC#5 integrate
.. //depot/projects/tcpecn/pc98/conf/GENERIC.hints#2 integrate
.. //depot/projects/tcpecn/pc98/include/clock.h#3 integrate
.. //depot/projects/tcpecn/pc98/pc98/machdep.c#5 integrate
.. //depot/projects/tcpecn/pci/if_rl.c#4 integrate
.. //depot/projects/tcpecn/powerpc/aim/clock.c#3 integrate
.. //depot/projects/tcpecn/powerpc/aim/locore.S#4 integrate
.. //depot/projects/tcpecn/powerpc/aim/machdep.c#5 integrate
.. //depot/projects/tcpecn/powerpc/aim/mmu_oea.c#2 integrate
.. //depot/projects/tcpecn/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/tcpecn/powerpc/booke/clock.c#2 integrate
.. //depot/projects/tcpecn/powerpc/booke/machdep.c#2 integrate
.. //depot/projects/tcpecn/powerpc/conf/DEFAULTS#3 integrate
.. //depot/projects/tcpecn/powerpc/conf/MPC85XX#2 integrate
.. //depot/projects/tcpecn/powerpc/fpu/fpu_add.c#2 integrate
.. //depot/projects/tcpecn/powerpc/fpu/fpu_compare.c#2 integrate
.. //depot/projects/tcpecn/powerpc/fpu/fpu_div.c#2 integrate
.. //depot/projects/tcpecn/powerpc/fpu/fpu_explode.c#2 integrate
.. //depot/projects/tcpecn/powerpc/fpu/fpu_implode.c#2 integrate
.. //depot/projects/tcpecn/powerpc/fpu/fpu_mul.c#2 integrate
.. //depot/projects/tcpecn/powerpc/fpu/fpu_sqrt.c#2 integrate
.. //depot/projects/tcpecn/powerpc/fpu/fpu_subr.c#2 integrate
.. //depot/projects/tcpecn/powerpc/include/asm.h#2 integrate
.. //depot/projects/tcpecn/powerpc/include/atomic.h#4 integrate
.. //depot/projects/tcpecn/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/tcpecn/powerpc/psim/openpic_iobus.c#4 integrate
.. //depot/projects/tcpecn/rpc/clnt_rc.c#2 integrate
.. //depot/projects/tcpecn/security/audit/audit.c#6 integrate
.. //depot/projects/tcpecn/security/audit/audit.h#2 integrate
.. //depot/projects/tcpecn/security/audit/audit_arg.c#4 integrate
.. //depot/projects/tcpecn/security/audit/audit_bsm.c#4 integrate
.. //depot/projects/tcpecn/security/audit/audit_bsm_klib.c#4 integrate
.. //depot/projects/tcpecn/security/audit/audit_bsm_token.c#2 integrate
.. //depot/projects/tcpecn/security/audit/audit_pipe.c#3 integrate
.. //depot/projects/tcpecn/security/audit/audit_syscalls.c#5 integrate
.. //depot/projects/tcpecn/security/audit/audit_trigger.c#3 integrate
.. //depot/projects/tcpecn/security/audit/audit_worker.c#5 integrate
.. //depot/projects/tcpecn/security/mac/mac_framework.h#3 integrate
.. //depot/projects/tcpecn/security/mac/mac_inet.c#2 integrate
.. //depot/projects/tcpecn/security/mac/mac_internal.h#2 integrate
.. //depot/projects/tcpecn/security/mac/mac_policy.h#3 integrate
.. //depot/projects/tcpecn/sparc64/conf/GENERIC#7 integrate
.. //depot/projects/tcpecn/sparc64/conf/NOTES#2 integrate
.. //depot/projects/tcpecn/sparc64/fhc/fhc.c#2 integrate
.. //depot/projects/tcpecn/sparc64/include/bus_common.h#2 integrate
.. //depot/projects/tcpecn/sparc64/include/intr_machdep.h#2 integrate
.. //depot/projects/tcpecn/sparc64/include/smp.h#2 integrate
.. //depot/projects/tcpecn/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/tcpecn/sparc64/pci/apb.c#2 integrate
.. //depot/projects/tcpecn/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/tcpecn/sparc64/pci/ofw_pcib.c#2 integrate
.. //depot/projects/tcpecn/sparc64/pci/ofw_pcib_subr.c#2 integrate
.. //depot/projects/tcpecn/sparc64/pci/ofw_pcib_subr.h#2 integrate
.. //depot/projects/tcpecn/sparc64/pci/ofw_pcibus.c#3 integrate
.. //depot/projects/tcpecn/sparc64/pci/psycho.c#4 integrate
.. //depot/projects/tcpecn/sparc64/pci/psychovar.h#3 integrate
.. //depot/projects/tcpecn/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/tcpecn/sparc64/sparc64/intr_machdep.c#3 integrate
.. //depot/projects/tcpecn/sparc64/sparc64/machdep.c#3 integrate
.. //depot/projects/tcpecn/sparc64/sparc64/mp_machdep.c#4 integrate
.. //depot/projects/tcpecn/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/tcpecn/sparc64/sparc64/upa.c#2 integrate
.. //depot/projects/tcpecn/sun4v/conf/DEFAULTS#2 integrate
.. //depot/projects/tcpecn/sun4v/conf/NOTES#2 integrate
.. //depot/projects/tcpecn/sun4v/sun4v/intr_machdep.c#3 integrate
.. //depot/projects/tcpecn/sun4v/sun4v/machdep.c#3 integrate
.. //depot/projects/tcpecn/sys/_lockmgr.h#1 branch
.. //depot/projects/tcpecn/sys/_stack.h#1 branch
.. //depot/projects/tcpecn/sys/ata.h#4 integrate
.. //depot/projects/tcpecn/sys/clock.h#2 integrate
.. //depot/projects/tcpecn/sys/cpuset.h#3 integrate
.. //depot/projects/tcpecn/sys/eventhandler.h#3 integrate
.. //depot/projects/tcpecn/sys/interrupt.h#3 integrate
.. //depot/projects/tcpecn/sys/jail.h#2 integrate
.. //depot/projects/tcpecn/sys/kernel.h#5 integrate
.. //depot/projects/tcpecn/sys/lock.h#3 integrate
.. //depot/projects/tcpecn/sys/lockf.h#3 integrate
.. //depot/projects/tcpecn/sys/lockmgr.h#7 integrate
.. //depot/projects/tcpecn/sys/param.h#9 integrate
.. //depot/projects/tcpecn/sys/proc.h#7 integrate
.. //depot/projects/tcpecn/sys/protosw.h#2 integrate
.. //depot/projects/tcpecn/sys/rwlock.h#4 integrate
.. //depot/projects/tcpecn/sys/sched.h#4 integrate
.. //depot/projects/tcpecn/sys/sleepqueue.h#3 integrate
.. //depot/projects/tcpecn/sys/socket.h#4 integrate
.. //depot/projects/tcpecn/sys/stack.h#3 integrate
.. //depot/projects/tcpecn/sys/syscallsubr.h#5 integrate
.. //depot/projects/tcpecn/sys/sysctl.h#6 integrate
.. //depot/projects/tcpecn/sys/termios.h#2 integrate
.. //depot/projects/tcpecn/sys/time.h#5 integrate
.. //depot/projects/tcpecn/sys/ttycom.h#2 integrate
.. //depot/projects/tcpecn/sys/vnode.h#5 integrate
.. //depot/projects/tcpecn/ufs/ffs/ffs_softdep.c#5 integrate
.. //depot/projects/tcpecn/ufs/ufs/dirhash.h#2 integrate
.. //depot/projects/tcpecn/ufs/ufs/inode.h#2 integrate
.. //depot/projects/tcpecn/ufs/ufs/ufs_dirhash.c#2 integrate
.. //depot/projects/tcpecn/ufs/ufs/ufs_gjournal.c#2 integrate
.. //depot/projects/tcpecn/ufs/ufs/ufs_lookup.c#3 integrate
.. //depot/projects/tcpecn/ufs/ufs/ufs_vnops.c#4 integrate
.. //depot/projects/tcpecn/vm/uma.h#2 integrate
.. //depot/projects/tcpecn/vm/uma_core.c#2 integrate
.. //depot/projects/tcpecn/vm/vm_glue.c#3 integrate
.. //depot/projects/tcpecn/vm/vm_map.c#4 integrate
.. //depot/projects/tcpecn/vm/vm_page.c#5 integrate
.. //depot/projects/tcpecn/vm/vm_phys.c#3 integrate
.. //depot/projects/tcpecn/vm/vm_reserv.c#2 integrate
.. //depot/projects/tcpecn/vm/vm_reserv.h#2 integrate
.. //depot/projects/tcpecn/vm/vm_zeroidle.c#3 integrate
Differences ...
==== //depot/projects/tcpecn/amd64/amd64/intr_machdep.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.39 2008/03/17 22:42:00 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.41 2008/04/11 03:26:39 jeff Exp $
*/
/*
@@ -85,9 +85,6 @@
static int intr_assign_cpu(void *arg, u_char cpu);
static void intr_disable_src(void *arg);
-#ifdef INTR_FILTER
-static void intr_event_stray(void *cookie);
-#endif
static void intr_init(void *__dummy);
static int intr_pic_registered(struct pic *pic);
static void intrcnt_setname(const char *name, int index);
@@ -142,7 +139,7 @@
vector = isrc->is_pic->pic_vector(isrc);
if (interrupt_sources[vector] != NULL)
return (EEXIST);
- error = intr_event_create(&isrc->is_event, isrc, 0,
+ error = intr_event_create(&isrc->is_event, isrc, 0, vector,
intr_disable_src, (mask_fn)isrc->is_pic->pic_enable_source,
(mask_fn)isrc->is_pic->pic_eoi_source, intr_assign_cpu, "irq%d:",
vector);
@@ -238,12 +235,11 @@
isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
}
-#ifdef INTR_FILTER
void
intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
{
+ struct intr_event *ie;
struct thread *td;
- struct intr_event *ie;
int vector;
td = curthread;
@@ -267,64 +263,11 @@
if (vector == 0)
clkintr_pending = 1;
- if (intr_event_handle(ie, frame) != 0)
- intr_event_stray(isrc);
-}
-
-static void
-intr_event_stray(void *cookie)
-{
- struct intsrc *isrc;
-
- isrc = cookie;
/*
* For stray interrupts, mask and EOI the source, bump the
* stray count, and log the condition.
*/
- isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
- (*isrc->is_straycount)++;
- if (*isrc->is_straycount < MAX_STRAY_LOG)
- log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc));
- else if (*isrc->is_straycount == MAX_STRAY_LOG)
- log(LOG_CRIT,
- "too many stray irq %d's: not logging anymore\n",
- isrc->is_pic->pic_vector(isrc));
-}
-#else
-void
-intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
-{
- struct thread *td;
- struct intr_event *ie;
- struct intr_handler *ih;
- int error, vector, thread, ret;
-
- td = curthread;
-
- /*
- * We count software interrupts when we process them. The
- * code here follows previous practice, but there's an
- * argument for counting hardware interrupts when they're
- * processed too.
- */
- (*isrc->is_count)++;
- PCPU_INC(cnt.v_intr);
-
- ie = isrc->is_event;
-
- /*
- * XXX: We assume that IRQ 0 is only used for the ISA timer
- * device (clk).
- */
- vector = isrc->is_pic->pic_vector(isrc);
- if (vector == 0)
- clkintr_pending = 1;
-
- /*
- * For stray interrupts, mask and EOI the source, bump the
- * stray count, and log the condition.
- */
- if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) {
+ if (intr_event_handle(ie, frame) != 0) {
isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
(*isrc->is_straycount)++;
if (*isrc->is_straycount < MAX_STRAY_LOG)
@@ -333,60 +276,8 @@
log(LOG_CRIT,
"too many stray irq %d's: not logging anymore\n",
vector);
- 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++;
- ret = 0;
- thread = 0;
- critical_enter();
- TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
- if (ih->ih_filter == NULL) {
- thread = 1;
- continue;
- }
- CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__,
- ih->ih_filter, ih->ih_argument == NULL ? frame :
- ih->ih_argument, ih->ih_name);
- if (ih->ih_argument == NULL)
- ret = ih->ih_filter(frame);
- else
- ret = ih->ih_filter(ih->ih_argument);
- /*
- * Wrapper handler special case: see
- * i386/intr_machdep.c::intr_execute_handlers()
- */
- if (!thread) {
- if (ret == FILTER_SCHEDULE_THREAD)
- thread = 1;
- }
}
-
- /*
- * If there are any threaded handlers that need to run,
- * mask the source as well as sending it an EOI. Otherwise,
- * just send it an EOI but leave it unmasked.
- */
- if (thread)
- isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
- else
- isrc->is_pic->pic_eoi_source(isrc);
-
- /* Schedule the ithread if needed. */
- if (thread) {
- error = intr_event_schedule_thread(ie);
- KASSERT(error == 0, ("bad stray interrupt"));
- }
- critical_exit();
- td->td_intr_nesting_level--;
}
-#endif
void
intr_resume(void)
==== //depot/projects/tcpecn/amd64/amd64/machdep.c#4 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.683 2008/03/16 10:58:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.686 2008/04/25 05:18:47 jeff Exp $");
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 17:30:53 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 657851065677; Fri, 25 Apr 2008 17:30:53 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 26FEB1065675
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 17:30:53 +0000 (UTC)
(envelope-from vi0@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id C01C68FC13
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 17:30:52 +0000 (UTC)
(envelope-from vi0@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PHUqJW062873
for <perforce@FreeBSD.org>; Fri, 25 Apr 2008 17:30:52 GMT
(envelope-from vi0@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PHUqjS062871
for perforce@freebsd.org; Fri, 25 Apr 2008 17:30:52 GMT
(envelope-from vi0@FreeBSD.org)
Date: Fri, 25 Apr 2008 17:30:52 GMT
Message-Id: <200804251730.m3PHUqjS062871@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
vi0@FreeBSD.org using -f
From: Przemek Witaszczyk <vi0@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140621 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 17:30:53 -0000
http://perforce.freebsd.org/chv.cgi?CH=140621
Change 140621 by vi0@vi0_gilgamesh.semihalf.com on 2008/04/25 17:30:09
Submitted by: vi0
Affected files ...
.. //depot/projects/soc2008/vi0/Efika01/README#1 add
.. //depot/projects/soc2008/vi0/Efika01/aim/clock.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/copyinout.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/interrupt.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/locore.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/mmu_oea.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/nexus.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/ofw_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/ofwmagic.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/swtch.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/trap.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/trap_subr.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/uio_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/uma_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/aim/vm_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/clock.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/copyinout.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/interrupt.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/locore.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/pmap.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/support.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/swtch.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/trap.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/trap_subr.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/uio_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/booke/vm_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/compile/.cvsignore#1 branch
.. //depot/projects/soc2008/vi0/Efika01/conf/.cvsignore#1 branch
.. //depot/projects/soc2008/vi0/Efika01/conf/DEFAULTS#1 branch
.. //depot/projects/soc2008/vi0/Efika01/conf/GENERIC#1 branch
.. //depot/projects/soc2008/vi0/Efika01/conf/GENERIC.hints#1 branch
.. //depot/projects/soc2008/vi0/Efika01/conf/MAC#1 branch
.. //depot/projects/soc2008/vi0/Efika01/conf/MPC85XX#1 branch
.. //depot/projects/soc2008/vi0/Efika01/conf/Makefile#1 branch
.. //depot/projects/soc2008/vi0/Efika01/conf/NOTES#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_add.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_arith.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_compare.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_div.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_emu.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_emu.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_explode.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_extern.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_implode.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_instr.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_mul.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_sqrt.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/fpu/fpu_subr.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/_bus.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/_inttypes.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/_limits.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/_stdint.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/_types.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/asm.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/atomic.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/bat.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/bootinfo.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/bus.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/bus_dma.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/clock.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/cpu.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/cpufunc.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/db_machdep.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/elf.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/endian.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/exec.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/float.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/floatingpoint.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/fpu.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/frame.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/gdb_machdep.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/hid.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/ieee.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/ieeefp.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/in_cksum.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/intr.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/intr_machdep.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/kdb.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/limits.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/md_var.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/memdev.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/metadata.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/mmuvar.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/mutex.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/nexusvar.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/ocpbus.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/ofw_machdep.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/openpicreg.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/openpicvar.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/param.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/pcb.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/pcpu.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/pio.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/pmap.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/pmc_mdep.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/powerpc.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/proc.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/profile.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/psl.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/pte.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/ptrace.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/reg.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/reloc.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/resource.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/runq.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/sc_machdep.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/setjmp.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/sf_buf.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/sigframe.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/signal.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/smp.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/spr.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/sr.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/stack.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/stdarg.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/tlb.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/trap.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/trap_aim.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/trap_booke.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/ucontext.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/varargs.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/include/vmparam.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/mpc85xx/nexus.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/mpc85xx/ocpbus.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/mpc85xx/ocpbus.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/mpc85xx/opic.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/mpc85xx/pci_ocp.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/ofw/ofw_pci.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/ofw/ofw_pci.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/ofw/ofw_pcib_pci.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/ofw/ofw_syscons.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/ofw/ofw_syscons.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/ata_kauai.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/ata_macio.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/grackle.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/gracklevar.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/hrowpic.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/hrowpicvar.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/macio.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/maciovar.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/openpic_macio.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/pswitch.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/uninorth.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powermac/uninorthvar.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/atomic.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/autoconf.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/bcopy.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/bus_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/busdma_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/copystr.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/cpu.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/db_disasm.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/db_hwwatch.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/db_interface.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/db_trace.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/elf_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/fpu.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/fuswintr.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/gdb_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/genassym.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/in_cksum.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/intr_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/mem.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/mmu_if.m#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/mp_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/openpic.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/pic_if.m#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/pmap_dispatch.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/sc_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/setjmp.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/sigcode.S#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/stack_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/suswintr.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/syncicache.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/powerpc/sys_machdep.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/psim/ata_iobus.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/psim/iobus.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/psim/iobusvar.h#1 branch
.. //depot/projects/soc2008/vi0/Efika01/psim/openpic_iobus.c#1 branch
.. //depot/projects/soc2008/vi0/Efika01/psim/psim-tree#1 branch
.. //depot/projects/soc2008/vi0/Efika01/psim/uart_iobus.c#1 branch
Differences ...
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 18:51:24 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 10290106566C; Fri, 25 Apr 2008 18:51:24 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C40B7106564A
for <perforce@freebsd.org>; Fri, 25 Apr 2008 18:51:23 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id A7E488FC1A
for <perforce@freebsd.org>; Fri, 25 Apr 2008 18:51:23 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PIpNsr075398
for <perforce@freebsd.org>; Fri, 25 Apr 2008 18:51:23 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PIpNa1075396
for perforce@freebsd.org; Fri, 25 Apr 2008 18:51:23 GMT
(envelope-from sam@freebsd.org)
Date: Fri, 25 Apr 2008 18:51:23 GMT
Message-Id: <200804251851.m3PIpNa1075396@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140625 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 18:51:24 -0000
http://perforce.freebsd.org/chv.cgi?CH=140625
Change 140625 by sam@sam_ebb on 2008/04/25 18:50:26
IFC @ 140624
Affected files ...
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/dtrace.1#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/README#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/baddof/baddof.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/badioctl/badioctl.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/chkargs/chkargs.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/Getopt.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/JDTrace.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/exception.lst#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/jdtrace.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/jdtrace/manifest/jdtrace.jar-manifest#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_FUNC.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_MDIM.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_NULL.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_REDEF.redef.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.avgtoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.maxnoarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.mintoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.quantizetoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_AGG_SCALAR.sumtoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_AGGARG.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_CLEAR_PROTO.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_IDENT.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_FUNC_UNDEF.badaggfunc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badexpr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.badkey3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_IDENT_UNDEF.noeffect.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_KEY_TYPE.badkey4.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqbad1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASETYPE.lqshort.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_BASEVAL.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMTYPE.lqbad1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_LIMVAL.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHBASE.order.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHLIM.order.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MATCHSTEP.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_MISMATCH.lqbadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPLARGE.lqtoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPSMALL.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPTYPE.lqbadinc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_LQUANT_STEPVAL.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_AGGARG.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_PROTO.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_NORMALIZE_SCALAR.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_ARG.lquantizetoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgnoarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.avgtoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.counttoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizenoarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.lquantizetoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxnoarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.maxtoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.minnoarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.mintoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizenoarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.quantizetoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumnoarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_PROTO_LEN.sumtoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_AGGARG.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badmany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_PROTO.badnone.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/err.D_TRUNC_SCALAR.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.allquant.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.avg_neg.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clear.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearavg2.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.cleardenormalize.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearlquantize.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.clearnormalize.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count2.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.count3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalize.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.denormalizeonly.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.fmtnormalize.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.forms.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.goodkey.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.keysort.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantize.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantnormal.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantrange.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantround.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.lquantzero.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.max_neg.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.min_neg.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs2.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multiaggs3.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.multinormalize.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.neglquant.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negorder.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negquant.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtrunc.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.negtruncquant.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.normalize.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.order.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantize.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantmany.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantround.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.quantzero.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signature.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeys.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.signedkeyspos.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.stddev.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.subr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.sum.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.trunc0.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.truncquant.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/aggs/tst.valsortkeypos.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.divby0_2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_DIV_ZERO.modby0.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.addmin.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.divmin.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muladd.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/err.D_SYNTAX.muldiv.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.basics.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arithmetic/tst.complex.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_ARR_BADREF.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRBIG.toobig.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRNULL.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_ARRSUB.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_DECL_PROTO_TYPE.badtuple.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/err.D_IDENT_UNDEF.badureg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic4.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic5.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.basic6.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/arrays/tst.uregsarray.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.this.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_ARG.badsig.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_PROTO_LEN.toomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_SYNTAX.errassign.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.tupoflow.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.cpyarray.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.diffprofile.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.initialize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.invalidref.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.misc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.orthogonality.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.this.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/tst.valassign.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.begin.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/err.D_PDESC_ZERO.tick.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.begin.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/begin/tst.multibegin.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_ADDROF_BITFIELD.BitfieldAddress.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.NegBitField.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFCONST.ZeroBitField.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.ExceedBaseType.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFSIZE.GreaterThan64.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_DECL_BFTYPE.badtype.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_OFFSETOF_BITFIELD.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/err.D_SIZEOF_BITFIELD.SizeofBitfield.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.BitFieldPromotion.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/bitfields/tst.SizeofBitField.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.end.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.resize3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/err.zerobuf.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.alignring.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.cputime.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.dynvarsize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.fill1.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.resize3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring2.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.ring3.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.smallring.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/buffering/tst.switch1.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.cpuusage.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.nice.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.priority.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.prsize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/err.D_XLATE_NOCONV.rssize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg0clause.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.arg1to8clause.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.caller1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.epid1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.errno1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.execname.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.hpriority.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.id1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.ipl1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.lwpsinfo1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.pid1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.tid1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.timestamp.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.vtimestamp.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggfun.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.aggtup.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.arrtup.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.body.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.both.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/err.D_IDENT_UNDEF.pred.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.nopred.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.pred.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predfirst.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/clauses/tst.predlast.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LOCASSC.NonLocalAssoc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_LONGINT.LongStruct.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PARMCLASS.BadStorageClass.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_NAME.VoidName.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_TYPE.Dyn.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VARARGS.VarLenArgs.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_PROTO_VOID.NonSoleVoid.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_SIGNINT.UnsignedStruct.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/err.D_DECL_VOIDATTR.ShortVoidDecl.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.arrays.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.basics.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.funcs.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.pointers.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/decls/tst.varargsfuncs.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/badptr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/countdown.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/counter.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/errorpath.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/hello.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/kstat.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/ksyms.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/renormalize.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rtime.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rw.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwinfo.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/rwtime.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/specopen.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/truss.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/trussrw.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/docsExamples/userfunc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_AGGREGATION.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DBLERROR.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_DYNAMIC.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_PRINCIPAL.end.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPEC.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_SPECUNAVAIL.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/drops/drp.DTRACEDROP_STKSTROVERFLOW.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/err.D_PDESC_ZERO.InvalidDescription1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.APIVersion.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.AddSearchPath.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.CoalesceTrace.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ELFGeneration.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.IncludedFilePath.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithFunctions#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithIDs#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithModules#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithNames#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ListProbesWithProviders#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.ShowCompilerCode.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceFunctions#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceIDs#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceModule#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceNames#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.TraceProvider#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/man.VerboseStabilityReport.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.AddSearchPath.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeGiga.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeKilo.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeMega.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.BufsizeTera.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel32.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DataModel64.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DefineNameWithCPP.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithFunction.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithID.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithModule.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithName.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithProvider.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.DestructWithoutW.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationOut.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ELFGenerationWithO.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExitStatus2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ExtraneousProbeIds.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidFuncName2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidId3.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule3.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidModule4.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProbeIdentifier.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider3.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidProvider4.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc3.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc4.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc5.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc6.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc7.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc8.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceFunc9.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID3.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID4.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID5.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID6.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceID7.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule3.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule4.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule5.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule6.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule7.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceModule8.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName3.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName4.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName5.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName6.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName7.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName8.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceName9.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider1.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider2.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider3.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider4.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.InvalidTraceProvider5.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.MultipleInvalidProbeId.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.PreprocessorStatement.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.QuietMode.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.TestCompile.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.UnDefineNameWithCPP.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroFunctionProbes.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroNameProbes.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbeIdentfier.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProbesWithoutZ.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroProviderProbes.d.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/err.D_IDENT_UNDEF.timespent.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.end.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.endwithoutbegin.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multibeginend.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/end/tst.multiend.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_DECL_IDRED.EnumSameName.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/err.D_UNKNOWN.RepeatIdentifiers.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumEquality.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumSameValue.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/enum/tst.EnumValAssign.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_BADADDR.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_DIVZERO.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.DTRACEFLT_UNKNOWN.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.error.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/error/tst.errorend.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.D_PROTO_LEN.noarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/err.exitarg1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/exit/tst.basic1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/err.D_PDESC_ZERO.notreturn.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.basic.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionentry.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.functionreturnvalue.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.ioctlargs.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offset.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.offsetzero.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.return0.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/fbtprovider/tst.tailcall.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_FUNC_UNDEF.progenyofbad1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_OP_VFPTR.badop.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.chillbadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.copyoutbadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.mobadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_ARG.raisebadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.allocanoarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.badbreakpoint.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.chilltoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrbadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyoutstrtoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.copyouttoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.motoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtabadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.mtatoomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.panicbadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.progenyofbad2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_PROTO_LEN.stopbadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_STRINGOF_TYPE.badstringof.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.D_VAR_UNDEF.badvar.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badalloca2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy4.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy5.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badbcopy6.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.badchill.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.chillbadarg.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyout.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutbadaddr.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.copyoutstrbadaddr.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoa6badaddr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntoabadaddr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadaddr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/err.inet_ntopbadarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.badfreopen.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.basename.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.bcopy.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.chill.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.cleanpath.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyin.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.copyinto.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ddi_pathname.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.default.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.freopen.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.ftruncate.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.index.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.lltostr.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.progenyof.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.rand.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strchr.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strjoin.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strstr.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.strtok_null.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substrminate.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.system.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_ADDROF_LVAL.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/err.D_EMPTY.empty.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.clauses.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/grammar/tst.stmts.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_DECL_IDRED.redef2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_IDENT_UNDEF.recur.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.baddef2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/err.D_OP_INCOMPAT.badxlate.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineDataAssign.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineExpression.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineKinds.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineTypedef.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/inline/tst.InlineWritableAssign.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/io/tst.fds.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/manifest/test.jar-manifest#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestAbort.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestBean.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestClose.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestDrop.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestEnable.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestFunctionLookup.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMaxConsumers.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestMultiAggPrinta.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeData.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestProbeDescription.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStateMachine.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/src/TestStopLock.java#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Abort.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Bean.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Close.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Drop.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.Enable.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.FunctionLookup.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MaxConsumers.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.MultiAggPrinta.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeData.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.ProbeDescription.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StateMachine.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.StopLock.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/java_api/tst.printa.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NL.char.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_CHR_NULL.char.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_DIGIT.InvalidDigit.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_INT_OFLOW.BigInt.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_STR_NL.string.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brace2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.brack3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/err.D_SYNTAX.paren3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/lexer/tst.D_MACRO_OFLOW.ParIntOvflow.d.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mdb/tst.dtracedcmd.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.icmp.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.tcp.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/mib/tst.udp.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/err.D_PRAGMA_OPTSET.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.badopt.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.boolopt.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.dynopt.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.enablerace.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.haslam.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.include.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.roch.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/misc/tst.schrock.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGKEY.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/err.D_PRINTA_AGGPROTO.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.many.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.same.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sort.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.sortpos.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.tuplecompat.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero2.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/multiaggs/tst.zero3.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/nfs/tst.call3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_BITFIELD.bitfield.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.badtype.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_OFFSETOF_TYPE.notsou.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.OffsetofNULL.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/err.D_UNKNOWN.badmemb.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofAlias.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofArith.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.OffsetofUnion.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.struct.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/offsetof/tst.union.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/operators/tst.ternary.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badlib.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PDESC_ZERO.badproc1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_BADPID.badproc2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_CREATEFAIL.many.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_FUNC.badfunc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_LIB.libdash.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.alldash.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.badname.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_NAME.globdash.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/err.D_PROC_OFF.toobig.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.addprobes.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.args1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.coverage.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.emptystack.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.float.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.fork.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.gcc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.main.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.manypids.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.newprobes.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.probemod.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex1.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex2.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex3.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.provregex4.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.ret2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.vfork.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pid/tst.weak2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.available.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/plockstat/tst.libmap.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.BadAlign.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.ArrayVar.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.DynamicVar.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_ADDROF_VAR.agg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_NONPTR.noptr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_DEREF_VOID.VoidPointerDeref.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_ARRFUN.ArrayAssignment.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_INCOMPAT.VoidPointerArith.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_LVAL.AddressChange.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.NonPointerAccess.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_PTR.badpointer.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.BadPointerAccess.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.D_OP_SOU.badpointer.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress4.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/err.InvalidAddress5.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ArrayPointer3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.GlobalVar.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.IntegerArithmetic1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerArithmetic3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.PointerAssignment.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.ValidPointer2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.VoidCast.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pointers/tst.basic2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGERR.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_DEPEND.main.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_INVAL.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_MALFORM.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.D_PRAGMA_UNUSED.UnusedPragma.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.circlibdep.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/err.invalidlibdep.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libchain.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdep.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/pragma/tst.libdepfullyconnected.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_PRED_SCALAR.NonScalarPred.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.invalid.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/err.D_SYNTAX.operr.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.argsnotcached.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.basics.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.complex.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/predicates/tst.predcache.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_IDENT_UNDEF.afterprobe.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_PRAGCTL_INVAL.tabdefine.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.D_SYNTAX.withoutpound.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.defincomp.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefelsenotendif.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefincomp.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.ifdefnotendif.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.incompelse.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/err.mulelse.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifdef.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifndef.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.ifnotdef.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicaland.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalandor.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.logicalor.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.muland.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.mulor.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.precondi.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.predicatedeclare.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexp.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpelse.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpif.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.preexpifelse.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/preprocessor/tst.withinprobe.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badagg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badfmt.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_AGGARG.badval.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTA_PROTO.bad.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.jstack.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.stack.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/err.D_PRINTF_ARG_TYPE.ustack.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.basics.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.def.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.dynwidth.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.fmt.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.many.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.manyval.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.stack.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.tuple.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printa/tst.walltimestamp.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_AGG_CONV.aggfmt.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.toomany.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_EXTRA.widths.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_FMT.badfmt.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_PROTO.novalue.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.aggarg.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_ARG_TYPE.recursive.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.noprec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_PROTO.nowidth.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badprec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PRINTF_DYN_TYPE.badwidth.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_PROTO_LEN.toofew.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/err.D_SYNTAX.badconv3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.basics.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.flags.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.hello.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.ints.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.precs.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.print-f.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printT.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printY.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printcont.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printeE.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.printgG.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.rawfmt.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.str.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.sym.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.uints.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.widths1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/printf/tst.wp.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.func_access.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.op_access.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/privs/tst.unpriv_funcs.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probeqtn.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.probestar.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_PDESC_ZERO.tickstar.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.assign.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declare.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.declarein.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.lbraces.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.probespec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.rbraces.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/err.D_SYNTAX.recdec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.basic1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.check.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declare.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.declareafter.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.emptyprobe.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragma.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaaftertab.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmainside.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.pragmaoutside.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/probes/tst.probestar.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.discard.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitkilled.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.signal.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.startexit.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZERO.profile.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonens.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROonensec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneus.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/err.D_PDESC_ZEROoneusec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.argtest.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.basic.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.func.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.mod.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilehz.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilems.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilemsec.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilenhz.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilens.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilensec.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profiles.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profilesec.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileus.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.profileusec.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.sym.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufunc.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.ufuncsort.ksh.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.umod.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/profile-n/tst.usym.ksh#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_INVAL.wrongdec4.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.nonprofile.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/err.D_PDESC_ZERO.wrongdec3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.basics.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginexit.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.beginprof.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probattrs.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probefunc.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probemod.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probename.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.probprov.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profend.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.profexit.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.trace.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/providers/tst.twoprof.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.aggrate.d.out#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.statusrate.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d#1 branch
.. //depot/projects/vap/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/rates/tst.switchrate.d.out#1 branch
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 19:21:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 501441065672; Fri, 25 Apr 2008 19:21:56 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 129FF106564A
for <perforce@freebsd.org>; Fri, 25 Apr 2008 19:21:56 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id F08138FC18
for <perforce@freebsd.org>; Fri, 25 Apr 2008 19:21:55 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PJLt0D081926
for <perforce@freebsd.org>; Fri, 25 Apr 2008 19:21:55 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PJLtrr081924
for perforce@freebsd.org; Fri, 25 Apr 2008 19:21:55 GMT
(envelope-from sam@freebsd.org)
Date: Fri, 25 Apr 2008 19:21:55 GMT
Message-Id: <200804251921.m3PJLtrr081924@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140629 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 19:21:56 -0000
http://perforce.freebsd.org/chv.cgi?CH=140629
Change 140629 by sam@sam_ebb on 2008/04/25 19:21:03
loopback fix
Affected files ...
.. //depot/projects/vap/sys/dev/usb/if_rum.c#18 integrate
Differences ...
==== //depot/projects/vap/sys/dev/usb/if_rum.c#18 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.18 2008/04/20 20:35:38 sam Exp $ */
+/* $FreeBSD: src/sys/dev/usb/if_rum.c,v 1.19 2008/04/25 19:13:38 sam Exp $ */
/*-
* Copyright (c) 2005-2007 Damien Bergamini <damien.bergamini@free.fr>
@@ -18,7 +18,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.18 2008/04/20 20:35:38 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/usb/if_rum.c,v 1.19 2008/04/25 19:13:38 sam Exp $");
/*-
* Ralink Technology RT2501USB/RT2601USB chipset driver
@@ -816,13 +816,14 @@
struct ieee80211com *ic = vap->iv_ic;
struct rum_softc *sc = ic->ic_ifp->if_softc;
+ usb_rem_task(sc->sc_udev, &sc->sc_task);
+ usb_rem_task(sc->sc_udev, &sc->sc_scantask);
callout_stop(&rvp->amrr_ch);
/* do it in a process context */
sc->sc_state = nstate;
sc->sc_arg = arg;
- usb_rem_task(sc->sc_udev, &sc->sc_task);
if (nstate == IEEE80211_S_INIT) {
rvp->newstate(vap, nstate, arg);
return 0;
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 19:51:29 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 24D161065675; Fri, 25 Apr 2008 19:51:29 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id D93EB1065672
for <perforce@freebsd.org>; Fri, 25 Apr 2008 19:51:28 +0000 (UTC)
(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id C38E08FC2A
for <perforce@freebsd.org>; Fri, 25 Apr 2008 19:51:28 +0000 (UTC)
(envelope-from wsalamon@computer.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PJpSQp083236
for <perforce@freebsd.org>; Fri, 25 Apr 2008 19:51:28 GMT
(envelope-from wsalamon@computer.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PJpQZZ083234
for perforce@freebsd.org; Fri, 25 Apr 2008 19:51:26 GMT
(envelope-from wsalamon@computer.org)
Date: Fri, 25 Apr 2008 19:51:26 GMT
Message-Id: <200804251951.m3PJpQZZ083234@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
wsalamon@computer.org using -f
From: Wayne Salamon <wsalamon@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140633 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 19:51:29 -0000
http://perforce.freebsd.org/chv.cgi?CH=140633
Change 140633 by wsalamon@vh2 on 2008/04/25 19:51:11
Integrate branch from parent.
Affected files ...
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/pmap.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/GENERIC#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/conf/NOTES#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/include/pcb_ext.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/isa/clock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_dummy.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_proto.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_syscall.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_sysent.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/linux32_sysvec.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/amd64/linux32/syscalls.master#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/elf_trampoline.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/exception.S#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/intr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/arm/locore.S#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/at91/at91.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/AVILA#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/BWCT#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/CRB#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/EP80219#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/HL200#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/IQ31244#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/KB920X#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/SIMICS#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/conf/SKYEYE#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/include/intr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/sa11x0/sa11x0_ost.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/ep80219_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.ep80219#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/files.iq31244#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i80321/iq31244_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/i8134x/files.i81342#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/avila_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/arm/xscale/ixp425/files.avila#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/forth/loader.conf#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/boot/i386/pxeldr/pxeldr.S#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/kern/opensolaris_string.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/acl.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/bitmap.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/byteorder.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/callb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/cpupart.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/dkio.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/mntent.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/objfs.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/taskq.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/compat/opensolaris/sys/taskq_impl.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/zfs_znode.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_file.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_file.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_util.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/linux/linux_util.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/svr4/svr4_misc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/compat/svr4/svr4_sysvec.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/Makefile.arm#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/Makefile.mips#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/NOTES#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files#6 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.amd64#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.i386#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.mips#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/files.pc98#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/ldscript.mips#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/ldscript.mips.cfe#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/conf/options.mips#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ral/LICENSE#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ral/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ral/rt2561.fw.uu#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ral/rt2561s.fw.uu#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ral/rt2661.fw.uu#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ral/rt2661_ucode.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/dev/ral/rt2860.fw.uu#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/contrib/pf/net/pf.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/aac/aac_disk.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpi_support/acpi_asus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpi_support/acpi_ibm.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/Osd/OsdSynch.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/acpi.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/acpica/acpi_cpu.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/asmc/asmc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/asmc/asmcvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-all.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-all.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-card.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-cbus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-disk.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-disk.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-isa.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-lowlevel.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-queue.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-raid.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-raid.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata-usb.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/ata_if.m#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-cam.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-cd.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-cd.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-fd.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ata/atapi-tape.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ah_osdep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ah_osdep.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ath_rate/amrr/amrr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ath_rate/amrr/amrr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ath_rate/onoe/onoe.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ath_rate/onoe/onoe.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ath_rate/sample/sample.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/ath_rate/sample/sample.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_athioctl.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_athrate.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ath/if_athvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/atkbdc/psm.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/awi/am79c930.c#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/awi/am79c930reg.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/awi/am79c930var.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/awi/awi.c#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/awi/awireg.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/awi/awivar.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/awi/if_awi_pccard.c#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bce/if_bce.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bce/if_bcefw.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bce/if_bcereg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_l2t.c#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_l2t.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_main.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_offload.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/cxgb_offload.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_ddp.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_l2t.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_offload.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/de/if_de.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/fb/vga.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ieee488/ibfoo.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/if_ndis/if_ndis.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/if_ndis/if_ndisvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ipw/if_ipw.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ipw/if_ipwvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iscsi/initiator/iscsi.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwi/if_iwi.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/iwi/if_iwivar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/k8temp/k8temp.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/malo/if_malo.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/malo/if_malo.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mfi/mfi.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/ip1000phy.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/ip1000phyreg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/mii/miidevs#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nfe/if_nfe.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nfe/if_nfereg.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/nvram/nvram.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/pci/pcivar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/if_ral_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/if_ralrate.c#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/if_ralrate.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2560.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2560reg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2560var.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2661_ucode.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/ral/rt2661var.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/re/if_re.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/midi/mpu401.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pci/hda/hdac.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/sound/pcm/dsp.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_aue.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_rum.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_rumvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_ural.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_uralvar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/if_zydreg.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/ubsa.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/uipaq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/usb/usbdevs#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wi/if_wavelan_ieee.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wi/if_wi_pccard.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wi/if_wi_pci.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wi/if_wivar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wi/spectrum24t_cf.h#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wpi/if_wpi.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/dev/wpi/if_wpivar.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/fdescfs/fdesc_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/denode.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/msdosfs/msdosfs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_node.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/smbfs/smbfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_vfsops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_apm.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_bsd.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_gpt.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_if.m#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_mbr.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_pc98.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/geom/part/g_part_vtoc8.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/ext2_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/ext2fs/inode.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnops.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/bios/apm.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/GENERIC#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/GENERIC.hints#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/conf/PAE#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/intr_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/mp_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/i386/pmap.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/ibcs2/ibcs2_util.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/clock.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/include/cpufunc.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/clock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/isa/pmtimer.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_dummy.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/linux_sysvec.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/conf/DEFAULTS#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/conf/GENERIC#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/conf/SKI#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/clock.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/mp_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/nexus.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/pmap.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/sapic.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/ia64/sscdisk.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ia64/include/vmparam.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/isa/atrtc.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/isa/rtc.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_cpuset.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_descrip.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_intr.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_jail.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_linker.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_lock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_lockf.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_mbuf.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_rwlock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_switch.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_synch.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_thread.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/kern_timeout.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_4bsd.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/sched_ule.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_clock.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_firmware.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_rtc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_sleepqueue.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_taskqueue.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_trap.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_turnstile.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/subr_witness.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/tty.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_shm.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/uipc_socket.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_cache.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_default.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_lookup.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_subr.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/kern/vfs_syscalls.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/compile/.cvsignore#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/ADM5120#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/ADM5120.hints#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/IDT#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/IDT.hints#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/MALTA#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/MALTA.hints#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/QEMU#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/SENTRY5#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/conf/SENTRY5.hints#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/_bus.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/_bus_octeon.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/_inttypes.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/_limits.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/_stdint.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/_types.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/am29lv081b.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/archtype.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/asm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/asmacros.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/atomic.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/bootinfo.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/bswap.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/bus.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/bus_dma.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/bus_octeon.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cache.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cache_mipsNN.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cache_r4k.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/clock.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/clockvar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cp0.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cpu.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cpufunc.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cpuinfo.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cpuregs.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/cputypes.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/db_machdep.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/defs.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/elf.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/endian.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/exec.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/float.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/floatingpoint.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/fpu.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/frame.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/gdb_machdep.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/hwfunc.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/ieee.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/ieeefp.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/in_cksum.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/intr.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/intr_machdep.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/iodev.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/kdb.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/limits.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/locore.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/md_var.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/memdev.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/metadata.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/minidump.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/mips_opcode.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/mp_watchdog.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/mutex.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/param.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pcb.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pci_cfgreg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pcpu.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pltfm.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pmap.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pmc_mdep.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/ppireg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/proc.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/profile.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/psl.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/pte.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/ptrace.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/queue.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/reg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/regdef.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/regnum.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/reloc.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/resource.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/rm7000.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/runq.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/segments.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/setjmp.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/sf_buf.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/sigframe.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/signal.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/smp.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/stdarg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/sysarch.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/timerreg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/trap.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/ucontext.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/varargs.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/include/vmparam.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/autoconf.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/busdma_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/cache.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/cache_mipsNN.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/copystr.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/cpu.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/db_disasm.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/db_interface.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/db_trace.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/dump_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/elf_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/exception.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/fp.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/gdb_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/genassym.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/in_cksum.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/intr_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/locore.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/mainbus.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/mem.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/mips_subr.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/mp_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/nexus.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/pm_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/pmap.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/psraccess.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/stack_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/support.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/swtch.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/tick.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/tlb.S#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/trap.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/uio_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips/vm_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/adm5120_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/adm5120reg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/admpci.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/console.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/files.adm5120#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/if_admsw.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/if_admswreg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/if_admswvar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/obio.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/obiovar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/std.adm5120#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/uart_bus_adm5120.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/uart_cpu_adm5120.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/uart_dev_adm5120.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/adm5120/uart_dev_adm5120.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/files.idt#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/idt_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/idtpci.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/idtreg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/if_kr.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/if_krreg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/obio.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/obiovar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/std.idt#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/uart_bus_rc32434.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/idt/uart_cpu_rc32434.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/files.malta#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/gt.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/gt_pci.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/gtreg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/gtvar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/malta_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/maltareg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/obio.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/obiovar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/std.malta#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/uart_bus_maltausart.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/uart_cpu_maltausart.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/yamon.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/malta/yamon.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/files.sentry5#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/obio.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/obiovar.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/s5_machdep.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/s5reg.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/siba_cc.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/siba_mips.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/siba_sdram.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/uart_bus_sbusart.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/mips/mips32/sentry5/uart_cpu_sbusart.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/Makefile#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/asmc/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ath_rate_amrr/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ath_rate_onoe/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ath_rate_sample/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/awi/Makefile#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/cxgb/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/cxgb/tom/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/firmware/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/k8temp/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/malo/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ral/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ralfw/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ralfw/Makefile.inc#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ralfw/rt2561/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ralfw/rt2561s/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/ralfw/rt2661/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_acl/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_amrr/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_ccmp/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_rssadapt/Makefile#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_scan_ap/Makefile#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_scan_sta/Makefile#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_tkip/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_wep/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/wlan_xauth/Makefile#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/modules/zfs/Makefile#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_zerocopy.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/bpf_zerocopy.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_loop.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_media.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/if_tap.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/radix.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/radix.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/radix_mpath.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/radix_mpath.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/route.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/route.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net/rtsock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/_ieee80211.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_acl.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_adhoc.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_adhoc.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_amrr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_amrr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto_ccmp.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto_none.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto_tkip.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_crypto_wep.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ddb.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_dfs.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_dfs.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_freebsd.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_freebsd.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_hostap.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_hostap.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ht.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ht.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_input.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ioctl.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_ioctl.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_monitor.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_monitor.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_node.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_node.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_output.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_phy.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_phy.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_power.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_power.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_proto.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_proto.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_regdomain.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_regdomain.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_rssadapt.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_rssadapt.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_scan.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_scan.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_scan_ap.c#2 delete
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_sta.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_sta.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_var.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_wds.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_wds.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/net80211/ieee80211_xauth.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/bluetooth/include/ng_bluetooth.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netflow/ng_netflow.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/netgraph.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netgraph/ng_base.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_mcast.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_pcb.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_pcb.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/in_proto.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_divert.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_fw2.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_icmp.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_input.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_ipsec.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_options.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/ip_output.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/raw_ip.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_asconf.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_bsd_addr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_bsd_addr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_constants.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_indata.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_input.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_output.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_pcb.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_pcb.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_sysctl.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctp_var.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctputil.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/sctputil.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_input.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_offload.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_output.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_reass.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_sack.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_syncache.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_timer.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_timewait.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/tcp_var.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet/udp_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/icmp6.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_pcb.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_proto.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/in6_src.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/nd6_nbr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/sctp6_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/netinet6/udp6_usrreq.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfs4client/nfs4_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_lock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_vfsops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nfsclient/nfsnode.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/nlm/nlm_prot_impl.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/clock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/pcrtc.c#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/sc_machdep.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/cbus/syscons_cbus.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/conf/GENERIC#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/conf/GENERIC.hints#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/include/clock.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pc98/pc98/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/pci/if_rl.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/clock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/locore.S#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/mmu_oea.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/aim/nexus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/booke/clock.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/DEFAULTS#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/conf/MPC85XX#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/fpu/fpu_add.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/fpu/fpu_compare.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/fpu/fpu_div.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/fpu/fpu_explode.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/fpu/fpu_implode.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/fpu/fpu_mul.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/fpu/fpu_sqrt.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/fpu/fpu_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/include/atomic.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/powerpc/powerpc/intr_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/rpc/clnt_rc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.c#5 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_arg.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm_klib.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_bsm_token.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_pipe.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_syscalls.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_trigger.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/audit/audit_worker.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_framework.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_inet.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_internal.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/security/mac/mac_policy.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/conf/GENERIC#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/conf/NOTES#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/fhc/fhc.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/bus_common.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/intr_machdep.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/smp.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/apb.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pci_if.m#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pcib.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pcib_subr.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/ofw_pcibus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/pci/psychovar.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sbus/sbus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/intr_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/mp_machdep.c#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sparc64/sparc64/upa.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/conf/DEFAULTS#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/conf/NOTES#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sun4v/sun4v/intr_machdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/_lockmgr.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/_stack.h#1 branch
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/ata.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/clock.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/cpuset.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/eventhandler.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/interrupt.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/jail.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/kernel.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/lock.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/lockf.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/lockmgr.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/param.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/proc.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/protosw.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/rwlock.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/sched.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/sleepqueue.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/socket.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/stack.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/syscallsubr.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/sysctl.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/termios.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/time.h#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/ttycom.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/sys/vnode.h#4 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ffs/ffs_softdep.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/dirhash.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/inode.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_dirhash.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_gjournal.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_lookup.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/ufs/ufs/ufs_vnops.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/uma.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/uma_core.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_glue.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_map.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_page.c#3 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_phys.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_reserv.c#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_reserv.h#2 integrate
.. //depot/projects/trustedbsd/audit_mac/src/sys/vm/vm_zeroidle.c#3 integrate
Differences ...
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/intr_machdep.c#3 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.39 2008/03/17 22:42:00 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.41 2008/04/11 03:26:39 jeff Exp $
*/
/*
@@ -85,9 +85,6 @@
static int intr_assign_cpu(void *arg, u_char cpu);
static void intr_disable_src(void *arg);
-#ifdef INTR_FILTER
-static void intr_event_stray(void *cookie);
-#endif
static void intr_init(void *__dummy);
static int intr_pic_registered(struct pic *pic);
static void intrcnt_setname(const char *name, int index);
@@ -142,7 +139,7 @@
vector = isrc->is_pic->pic_vector(isrc);
if (interrupt_sources[vector] != NULL)
return (EEXIST);
- error = intr_event_create(&isrc->is_event, isrc, 0,
+ error = intr_event_create(&isrc->is_event, isrc, 0, vector,
intr_disable_src, (mask_fn)isrc->is_pic->pic_enable_source,
(mask_fn)isrc->is_pic->pic_eoi_source, intr_assign_cpu, "irq%d:",
vector);
@@ -238,12 +235,11 @@
isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
}
-#ifdef INTR_FILTER
void
intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
{
+ struct intr_event *ie;
struct thread *td;
- struct intr_event *ie;
int vector;
td = curthread;
@@ -267,64 +263,11 @@
if (vector == 0)
clkintr_pending = 1;
- if (intr_event_handle(ie, frame) != 0)
- intr_event_stray(isrc);
-}
-
-static void
-intr_event_stray(void *cookie)
-{
- struct intsrc *isrc;
-
- isrc = cookie;
/*
* For stray interrupts, mask and EOI the source, bump the
* stray count, and log the condition.
*/
- isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
- (*isrc->is_straycount)++;
- if (*isrc->is_straycount < MAX_STRAY_LOG)
- log(LOG_ERR, "stray irq%d\n", isrc->is_pic->pic_vector(isrc));
- else if (*isrc->is_straycount == MAX_STRAY_LOG)
- log(LOG_CRIT,
- "too many stray irq %d's: not logging anymore\n",
- isrc->is_pic->pic_vector(isrc));
-}
-#else
-void
-intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame)
-{
- struct thread *td;
- struct intr_event *ie;
- struct intr_handler *ih;
- int error, vector, thread, ret;
-
- td = curthread;
-
- /*
- * We count software interrupts when we process them. The
- * code here follows previous practice, but there's an
- * argument for counting hardware interrupts when they're
- * processed too.
- */
- (*isrc->is_count)++;
- PCPU_INC(cnt.v_intr);
-
- ie = isrc->is_event;
-
- /*
- * XXX: We assume that IRQ 0 is only used for the ISA timer
- * device (clk).
- */
- vector = isrc->is_pic->pic_vector(isrc);
- if (vector == 0)
- clkintr_pending = 1;
-
- /*
- * For stray interrupts, mask and EOI the source, bump the
- * stray count, and log the condition.
- */
- if (ie == NULL || TAILQ_EMPTY(&ie->ie_handlers)) {
+ if (intr_event_handle(ie, frame) != 0) {
isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
(*isrc->is_straycount)++;
if (*isrc->is_straycount < MAX_STRAY_LOG)
@@ -333,60 +276,8 @@
log(LOG_CRIT,
"too many stray irq %d's: not logging anymore\n",
vector);
- 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++;
- ret = 0;
- thread = 0;
- critical_enter();
- TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
- if (ih->ih_filter == NULL) {
- thread = 1;
- continue;
- }
- CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__,
- ih->ih_filter, ih->ih_argument == NULL ? frame :
- ih->ih_argument, ih->ih_name);
- if (ih->ih_argument == NULL)
- ret = ih->ih_filter(frame);
- else
- ret = ih->ih_filter(ih->ih_argument);
- /*
- * Wrapper handler special case: see
- * i386/intr_machdep.c::intr_execute_handlers()
- */
- if (!thread) {
- if (ret == FILTER_SCHEDULE_THREAD)
- thread = 1;
- }
}
-
- /*
- * If there are any threaded handlers that need to run,
- * mask the source as well as sending it an EOI. Otherwise,
- * just send it an EOI but leave it unmasked.
- */
- if (thread)
- isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
- else
- isrc->is_pic->pic_eoi_source(isrc);
-
- /* Schedule the ithread if needed. */
- if (thread) {
- error = intr_event_schedule_thread(ie);
- KASSERT(error == 0, ("bad stray interrupt"));
- }
- critical_exit();
- td->td_intr_nesting_level--;
}
-#endif
void
intr_resume(void)
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/machdep.c#3 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.683 2008/03/16 10:58:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -61,7 +61,6 @@
#include <sys/buf.h>
#include <sys/bus.h>
#include <sys/callout.h>
-#include <sys/clock.h>
#include <sys/cons.h>
#include <sys/cpu.h>
#include <sys/eventhandler.h>
@@ -847,11 +846,23 @@
#if !defined(DEV_ATPIC) && defined(DEV_ISA)
#include <isa/isavar.h>
-u_int
+#include <isa/isareg.h>
+/*
+ * Return a bitmap of the current interrupt requests. This is 8259-specific
+ * and is only suitable for use at probe time.
+ * This is only here to pacify sio. It is NOT FATAL if this doesn't work.
+ * It shouldn't be here. There should probably be an APIC centric
+ * implementation in the apic driver code, if at all.
+ */
+intrmask_t
isa_irq_pending(void)
{
+ u_char irr1;
+ u_char irr2;
- return (0);
+ irr1 = inb(IO_ICU1);
+ irr2 = inb(IO_ICU2);
+ return ((irr2 << 8) | irr1);
}
#endif
==== //depot/projects/trustedbsd/audit_mac/src/sys/amd64/amd64/pmap.c#3 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.611 2008/04/02 04:39:47 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.614 2008/04/10 16:04:50 alc Exp $");
/*
* Manages physical address maps.
@@ -215,11 +215,12 @@
static void free_pv_entry(pmap_t pmap, pv_entry_t pv);
static pv_entry_t get_pv_entry(pmap_t locked_pmap, int try);
static void pmap_pv_demote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa);
-static boolean_t pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_page_t m);
+static boolean_t pmap_pv_insert_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa);
static void pmap_pv_promote_pde(pmap_t pmap, vm_offset_t va, vm_paddr_t pa);
static void pmap_pvh_free(struct md_page *pvh, pmap_t pmap, vm_offset_t va);
static pv_entry_t pmap_pvh_remove(struct md_page *pvh, pmap_t pmap,
vm_offset_t va);
+static int pmap_pvh_wired_mappings(struct md_page *pvh, int count);
static boolean_t pmap_demote_pde(pmap_t pmap, pd_entry_t *pde, vm_offset_t va);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 20:09:51 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 72E561065673; Fri, 25 Apr 2008 20:09:51 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 356D21065670
for <perforce@freebsd.org>; Fri, 25 Apr 2008 20:09:51 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 23F558FC14
for <perforce@freebsd.org>; Fri, 25 Apr 2008 20:09:51 +0000 (UTC)
(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PK9poa087407
for <perforce@freebsd.org>; Fri, 25 Apr 2008 20:09:51 GMT
(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PK9pr5087405
for perforce@freebsd.org; Fri, 25 Apr 2008 20:09:51 GMT
(envelope-from sam@freebsd.org)
Date: Fri, 25 Apr 2008 20:09:51 GMT
Message-Id: <200804252009.m3PK9pr5087405@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140635 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 20:09:51 -0000
http://perforce.freebsd.org/chv.cgi?CH=140635
Change 140635 by sam@sam_ebb on 2008/04/25 20:09:46
IFC @ 140634
Affected files ...
.. //depot/projects/vap/sys/net80211/ieee80211.c#40 edit
Differences ...
==== //depot/projects/vap/sys/net80211/ieee80211.c#40 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.46 2008/04/20 20:35:43 sam Exp $");
+__FBSDID("$FreeBSD: src/sys/net80211/ieee80211.c,v 1.47 2008/04/25 19:45:42 sam Exp $");
/*
* IEEE 802.11 generic handler
@@ -181,6 +181,22 @@
if_printf(ifp, "need promiscuous mode update callback\n");
}
+static int
+null_output(struct ifnet *ifp, struct mbuf *m,
+ struct sockaddr *dst, struct rtentry *rt0)
+{
+ if_printf(ifp, "discard raw packet\n");
+ m_freem(m);
+ return EIO;
+}
+
+static void
+null_input(struct ifnet *ifp, struct mbuf *m)
+{
+ if_printf(ifp, "if_input should not be called\n");
+ m_freem(m);
+}
+
/*
* Attach/setup the common net80211 state. Called by
* the driver on attach to prior to creating any vap's.
@@ -225,6 +241,9 @@
if_attach(ifp);
ifp->if_mtu = IEEE80211_MTU_MAX;
ifp->if_broadcastaddr = ieee80211broadcastaddr;
+ ifp->if_output = null_output;
+ ifp->if_input = null_input; /* just in case */
+ ifp->if_resolvemulti = NULL; /* NB: callers check */
ifa = ifaddr_byindex(ifp->if_index);
KASSERT(ifa != NULL, ("%s: no lladdr!\n", __func__));
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 20:25:12 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 144461065682; Fri, 25 Apr 2008 20:25:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CAD261065680
for <perforce@freebsd.org>; Fri, 25 Apr 2008 20:25:11 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id BA43F8FC0C
for <perforce@freebsd.org>; Fri, 25 Apr 2008 20:25:11 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PKPBmf088409
for <perforce@freebsd.org>; Fri, 25 Apr 2008 20:25:11 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PKPBRf088407
for perforce@freebsd.org; Fri, 25 Apr 2008 20:25:11 GMT
(envelope-from gabor@freebsd.org)
Date: Fri, 25 Apr 2008 20:25:11 GMT
Message-Id: <200804252025.m3PKPBRf088407@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140636 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 20:25:12 -0000
http://perforce.freebsd.org/chv.cgi?CH=140636
Change 140636 by gabor@gabor_server on 2008/04/25 20:24:15
- Arrange Makefiles for the translation
Affected files ...
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/Makefile#2 edit
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/hardware/Makefile#2 edit
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/readme/Makefile#2 edit
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/relnotes/Makefile#2 edit
Differences ...
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/Makefile,v 1.8 2007/08/15 03:02:22 bmah Exp $
+# $FreeBSD$
RELN_ROOT?= ${.CURDIR}/..
@@ -7,7 +7,7 @@
SUBDIR+= readme
SUBDIR+= errata
-COMPAT_SYMLINK = en
+COMPAT_SYMLINK = es
.include "${RELN_ROOT}/share/mk/doc.relnotes.mk"
.include "${DOC_PREFIX}/share/mk/doc.project.mk"
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/hardware/Makefile#2 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/hardware/Makefile,v 1.10 2007/02/19 02:46:12 bmah Exp $
+# $FreeBSD$
RELN_ROOT?= ${.CURDIR}/../..
.ifdef NO_LANGCODE_IN_DESTDIR
DESTDIR?= ${DOCDIR}/hardware
.else
-DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/hardware
+DESTDIR?= ${DOCDIR}/es_ES.ISO8859-1/hardware
.endif
DOC?= article
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/readme/Makefile#2 (text+ko) ====
@@ -1,10 +1,10 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/readme/Makefile,v 1.7 2001/09/03 14:39:32 dd Exp $
+# $FreeBSD$
RELN_ROOT?= ${.CURDIR}/../..
.ifdef NO_LANGCODE_IN_DESTDIR
DESTDIR?= ${DOCDIR}/readme
.else
-DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/readme
+DESTDIR?= ${DOCDIR}/es_ES.ISO8859-1/readme
.endif
DOC?= article
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/relnotes/Makefile#2 (text+ko) ====
@@ -1,11 +1,11 @@
-# $FreeBSD: src/release/doc/en_US.ISO8859-1/relnotes/Makefile,v 1.11 2006/12/07 17:45:45 hrs Exp $
+# $FreeBSD$
RELN_ROOT?= ${.CURDIR}/../..
.ifdef NO_LANGCODE_IN_DESTDIR
DESTDIR?= ${DOCDIR}/relnotes
.else
-DESTDIR?= ${DOCDIR}/en_US.ISO8859-1/relnotes
+DESTDIR?= ${DOCDIR}/es_ES.ISO8859-1/relnotes
.endif
DOC?= article
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 20:26:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 3E4AF1065672; Fri, 25 Apr 2008 20:26:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 004CF106566C
for <perforce@freebsd.org>; Fri, 25 Apr 2008 20:26:12 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id E39488FC15
for <perforce@freebsd.org>; Fri, 25 Apr 2008 20:26:12 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PKQCwk088443
for <perforce@freebsd.org>; Fri, 25 Apr 2008 20:26:12 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PKQC3R088441
for perforce@freebsd.org; Fri, 25 Apr 2008 20:26:12 GMT
(envelope-from gabor@freebsd.org)
Date: Fri, 25 Apr 2008 20:26:12 GMT
Message-Id: <200804252026.m3PKQC3R088441@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140637 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 20:26:13 -0000
http://perforce.freebsd.org/chv.cgi?CH=140637
Change 140637 by gabor@gabor_server on 2008/04/25 20:25:31
IFC
Affected files ...
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#2 integrate
.. //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#2 integrate
.. //depot/projects/docproj_es/www/en/projects/summerofcode-2008.sgml#2 integrate
Differences ...
==== //depot/projects/docproj_es/doc/es_ES.ISO8859-1/articles/linux-users/article.sgml#2 (text+ko) ====
@@ -22,7 +22,7 @@
<holder>El Proyecto de Documentación de &os;</holder>
</copyright>
- <releaseinfo>$FreeBSD: doc/es_ES.ISO8859-1/articles/linux-users/article.sgml,v 1.1 2008/04/24 19:11:13 carvay Exp $</releaseinfo>
+ <releaseinfo>$FreeBSD: doc/es_ES.ISO8859-1/articles/linux-users/article.sgml,v 1.2 2008/04/24 21:25:17 carvay Exp $</releaseinfo>
<legalnotice id="trademarks" role="trademarks">
&tm-attrib.freebsd;
@@ -148,7 +148,7 @@
Cómo elegir la versión apropriada de &os;</ulink>.</para>
</note>
- <para>Para más informació sobre los packages consulte
+ <para>Para más información sobre los packages consulte
la sección 4.4 del Handbook: <ulink
url="&url.base;/doc/es_ES.ISO8859-1/books/handbook/packages-using.html">Uso del sistema de packages</ulink>.</para>
</sect2>
@@ -454,9 +454,9 @@
url="&url.base;/doc/en_US.ISO8859-1/books/handbook/cutting-edge.html">capítulo 23</ulink>
del Handbook.</para>
- <para>Las actualizaciones binarias son semejantes
- <command>yum</command> o <command>apt-get</command> de &linux; El
- El programa &man.freebsd-update.8; descargará las actualizaciones
+ <para>Las actualizaciones binarias son semejantes a
+ <command>yum</command> o <command>apt-get</command> de &linux;. El
+ programa &man.freebsd-update.8; descargará las actualizaciones
pendientes del sistema y las instalará. Las actualizaciones pueden
ser programadas con &man.cron.8;.</para>
==== //depot/projects/docproj_es/doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl#2 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl,v 1.10 2004/02/01 19:59:22 jesusr Exp $ -->
+<!-- $FreeBSD: doc/es_ES.ISO8859-1/share/sgml/freebsd.dsl,v 1.11 2008/04/24 21:40:03 carvay Exp $ -->
<!DOCTYPE style-sheet PUBLIC "-//James Clark//DTD DSSSL Style Sheet//EN" [
<!ENTITY freebsd.dsl PUBLIC "-//FreeBSD//DOCUMENT DocBook Language Neutral Stylesheet//EN" CDATA DSSSL>
@@ -22,7 +22,7 @@
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
- (literal "Éste y otros documentos pueden obtenerse en ")
+ (literal "Puede descargar éste y muchos otros documentos desde ")
(create-link
(list (list "HREF" "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
(literal "ftp://ftp.FreeBSD.org/pub/FreeBSD/doc/"))
@@ -30,17 +30,17 @@
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
- (literal "Para preguntas acerca de FreeBSD, leer la ")
+ (literal "Si tiene dudas sobre FreeBSD consulte la ")
(create-link
(list (list "HREF" "http://www.FreeBSD.org/docs.html"))
(literal "documentación"))
- (literal " antes de contactar con la lista <")
+ (literal " antes de escribir a la lista <")
(create-link
(list (list "HREF" "mailto:questions@FreeBSD.org"))
(literal "questions@FreeBSD.org"))
(literal ">.")
(make empty-element gi: "br")
- (literal "Para preguntas acerca de esta documentación, e-mail a <")
+ (literal "Envíe sus preguntas sobre la documentación a <")
(create-link (list (list "HREF" "mailto:doc@FreeBSD.org"))
(literal "doc@FreeBSD.org"))
(literal ">.")))))
==== //depot/projects/docproj_es/www/en/projects/summerofcode-2008.sgml#2 (text+ko) ====
@@ -1,6 +1,6 @@
<!DOCTYPE HTML PUBLIC "-//FreeBSD//DTD HTML 4.01 Transitional-Based Extension//EN" [
<!ENTITY base CDATA "..">
-<!ENTITY date "$FreeBSD: www/en/projects/summerofcode-2008.sgml,v 1.1 2008/04/22 08:59:24 murray Exp $">
+<!ENTITY date "$FreeBSD: www/en/projects/summerofcode-2008.sgml,v 1.2 2008/04/24 21:22:35 murray Exp $">
<!ENTITY title "FreeBSD Summer of Code 2008">
<!ENTITY % navinclude.developers "INCLUDE">
<!ENTITY % developers SYSTEM "../developers.sgml"> %developers;
@@ -34,7 +34,7 @@
<li>Allowing for Parallel builds in the FreeBSD Ports Collection,<br>
David Forsythe, mentored by Mark Linimon</li>
<li>Implementation of MPLS in FreeBSD,<br>
- Ryan French, mentored by Kip Macy</li>
+ Ryan French, mentored by Murray Stokely</li>
<li>Audit Firewall Events from Kernel,<br>
Diego Giagio, mentored by Christian S.J. Peron</li>
<li>Embedded FreeBSD project,<br>
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 21:50:42 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B75C9106567D; Fri, 25 Apr 2008 21:50:42 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 790B51065678
for <perforce@freebsd.org>; Fri, 25 Apr 2008 21:50:42 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 6F1148FC23
for <perforce@freebsd.org>; Fri, 25 Apr 2008 21:50:42 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PLogYi002285
for <perforce@freebsd.org>; Fri, 25 Apr 2008 21:50:42 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PLogJC002283
for perforce@freebsd.org; Fri, 25 Apr 2008 21:50:42 GMT
(envelope-from gabor@freebsd.org)
Date: Fri, 25 Apr 2008 21:50:42 GMT
Message-Id: <200804252150.m3PLogJC002283@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140642 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 21:50:43 -0000
http://perforce.freebsd.org/chv.cgi?CH=140642
Change 140642 by gabor@gabor_server on 2008/04/25 21:50:11
- Fix link
Affected files ...
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/article.sgml#3 edit
Differences ...
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/article.sgml#3 (text+ko) ====
@@ -51,7 +51,7 @@
<year>2005</year>
<year>2008</year>
<holder role="mailto:doc@FreeBSD.org">The &os; Documentation Project</holder>
- <holder role="mailto:doc@FreeBSD.org">The &os; Spanish Documentation Project</holder>
+ <holder role="mailto:doc@es.freebsd.org">The &os; Spanish Documentation Project</holder>
</copyright>
<legalnotice id="trademarks" role="trademarks">
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 22:38:36 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id D86231065685; Fri, 25 Apr 2008 22:38:35 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 98B83106566C
for <perforce@freebsd.org>; Fri, 25 Apr 2008 22:38:35 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 8FCE48FC20
for <perforce@freebsd.org>; Fri, 25 Apr 2008 22:38:35 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PMcZwM004950
for <perforce@freebsd.org>; Fri, 25 Apr 2008 22:38:35 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PMcZpF004948
for perforce@freebsd.org; Fri, 25 Apr 2008 22:38:35 GMT
(envelope-from jb@freebsd.org)
Date: Fri, 25 Apr 2008 22:38:35 GMT
Message-Id: <200804252238.m3PMcZpF004948@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140643 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 22:38:36 -0000
http://perforce.freebsd.org/chv.cgi?CH=140643
Change 140643 by jb@freebsd3 on 2008/04/25 22:38:18
IFC
Affected files ...
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#72 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#17 integrate
.. //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#71 integrate
.. //depot/projects/dtrace/ports/MOVED#80 integrate
.. //depot/projects/dtrace/src/sbin/ddb/Makefile#2 integrate
.. //depot/projects/dtrace/src/sbin/ddb/ddb.8#4 integrate
.. //depot/projects/dtrace/src/sbin/ddb/ddb.c#4 integrate
.. //depot/projects/dtrace/src/sbin/ddb/ddb.h#2 integrate
.. //depot/projects/dtrace/src/sbin/ddb/ddb_capture.c#1 branch
.. //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#41 integrate
.. //depot/projects/dtrace/src/sys/conf/files#86 integrate
.. //depot/projects/dtrace/src/sys/ddb/db_capture.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/acpica/acpi_thermal.c#11 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_82571.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_82571.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_api.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_api.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_defines.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_hw.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_ich8lan.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_ich8lan.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_osdep.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_phy.c#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/e1000_phy.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/em/if_em.c#20 integrate
.. //depot/projects/dtrace/src/sys/dev/em/if_em.h#14 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_82575.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_api.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_api.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_defines.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_hw.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_mac.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_manage.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_osdep.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_osdep.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/e1000_phy.c#2 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/if_igb.c#3 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/if_igb.h#2 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_rum.c#7 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union.h#8 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_subr.c#16 integrate
.. //depot/projects/dtrace/src/sys/fs/unionfs/union_vnops.c#16 integrate
.. //depot/projects/dtrace/src/sys/i386/i386/pmap.c#37 integrate
.. //depot/projects/dtrace/src/sys/ia64/ia64/machdep.c#22 integrate
.. //depot/projects/dtrace/src/sys/modules/em/Makefile#8 integrate
.. //depot/projects/dtrace/src/sys/net80211/ieee80211.c#12 integrate
.. //depot/projects/dtrace/www/share/sgml/usergroups.xml#21 integrate
Differences ...
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml#72 (text+ko) ====
@@ -1,4 +1,4 @@
-<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.787 2008/04/24 05:48:43 osa Exp $ -->
+<!-- $FreeBSD: doc/en_US.ISO8859-1/articles/contributors/contrib.additional.sgml,v 1.788 2008/04/25 19:51:43 tabthorpe Exp $ -->
<!--
NOTE TO COMMITTERS: Contributors lists are sorted in alphabetical
order by first name.
@@ -3349,6 +3349,11 @@
</listitem>
<listitem>
+ <para>Guy Brand
+ <email>gb@isis.u-strasbg.fr</email></para>
+ </listitem>
+
+ <listitem>
<para>Guy Coleman
<email>gtchask@mm.st</email></para>
</listitem>
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml#17 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.388 2008/03/01 09:03:32 blackend Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/handbook/install/chapter.sgml,v 1.389 2008/04/25 19:03:56 remko Exp $
-->
<chapter id="install">
@@ -152,7 +152,7 @@
</sect3>
<sect3>
- <title>&os;/&arch.amd64; Architecture</title>
+ <title>&os;/&arch.amd64;</title>
<para>There are two classes of processors capable of running
&os;/&arch.amd64;. The first are AMD64 processors,
@@ -2738,7 +2738,7 @@
<para>To allow anonymous FTP, use the arrow keys to select
&gui.yes; and press <keycap>Enter</keycap>.
- An additionnal confirmation will display:</para>
+ An additional confirmation will display:</para>
<screen> User Confirmation Requested
Anonymous FTP permits un-authenticated users to connect to the system
==== //depot/projects/dtrace/doc/en_US.ISO8859-1/books/porters-handbook/book.sgml#71 (text+ko) ====
@@ -1,7 +1,7 @@
<!--
The FreeBSD Documentation Project
- $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.927 2008/04/23 01:58:05 linimon Exp $
+ $FreeBSD: doc/en_US.ISO8859-1/books/porters-handbook/book.sgml,v 1.928 2008/04/25 15:20:29 dfr Exp $
-->
<!DOCTYPE BOOK PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -11456,6 +11456,11 @@
</row>
<row>
+ <entry>6.3-STABLE after adding l_sysid to struct flock.</entry>
+ <entry>603102</entry>
+ </row>
+
+ <row>
<entry>7.0-CURRENT.</entry>
<entry>700000</entry>
</row>
==== //depot/projects/dtrace/ports/MOVED#80 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1577 2008/04/22 21:11:12 ehaupt Exp $
+# $FreeBSD: ports/MOVED,v 1.1578 2008/04/25 20:23:33 miwi Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3454,3 +3454,8 @@
multimedia/exportvideo||2008-04-21|Add-on for soon to be removed nuppelvideo port
multimedia/nuppelvideo||2008-04-21|Unmaintained upstream for years. The nuppelvideo format is now supported by mencoder
graphics/ascii0|graphics/asciio|2008-04-22|renamed by delete+add
+misc/kde3-i18n-id||2008-04-25|Has expired: "Distfile no longer available, outdated"
+net/dhcp-agent||2008-04-25|Has expired: Dhcp-agent has not been updated since 2003, it does not build with guile-1.8, and it is unmaintained
+net/ocaml-netclient||2008-04-25|Has expired: is part of ocaml-net
+net/samplicator||2008-04-25|Has expired: Project has vanished
+graphics/entice||2008-04-25|Has expired: Broken and unmaintained
==== //depot/projects/dtrace/src/sbin/ddb/Makefile#2 (text+ko) ====
@@ -1,8 +1,11 @@
-# $FreeBSD: src/sbin/ddb/Makefile,v 1.1 2007/12/26 09:38:22 rwatson Exp $
+# $FreeBSD: src/sbin/ddb/Makefile,v 1.2 2008/04/25 17:34:09 rwatson Exp $
PROG= ddb
-SRCS= ddb.c ddb_script.c
+SRCS= ddb.c ddb_capture.c ddb_script.c
MAN= ddb.8
WARNS= 3
+DPADD= ${LIBKVM}
+LDADD= -lkvm
+
.include <bsd.prog.mk>
==== //depot/projects/dtrace/src/sbin/ddb/ddb.8#4 (text+ko) ====
@@ -1,5 +1,5 @@
.\"-
-.\" Copyright (c) 2007 Robert N. M. Watson
+.\" Copyright (c) 2007-2008 Robert N. M. Watson
.\" All rights reserved.
.\"
.\" Redistribution and use in source and binary forms, with or without
@@ -23,9 +23,9 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.4 2008/04/04 07:31:43 ru Exp $
+.\" $FreeBSD: src/sbin/ddb/ddb.8,v 1.5 2008/04/25 17:34:09 rwatson Exp $
.\"
-.Dd April 4, 2008
+.Dd April 24, 2008
.Dt DDB 8
.Os
.Sh NAME
@@ -33,6 +33,16 @@
.Nd "configure DDB kernel debugger properties"
.Sh SYNOPSIS
.Nm
+.Cm capture
+.Op Fl M core
+.Op Fl N system
+.Cm print
+.Nm
+.Cm capture
+.Op Fl M core
+.Op Fl N system
+.Cm status
+.Nm
.Cm script
.Ar scriptname
.Nm
@@ -67,6 +77,33 @@
Whitespace at the beginning of lines will be ignored as will lines where the
first non-whitespace character is
.Ql # .
+.Sh OUTPUT CAPTURE
+The
+.Nm
+utility can be used to extract the contents of the
+.Xr ddb 4
+output capture buffer of the current live kernel, or from the crash dump of a
+kernel on disk.
+The following debugger commands are available from the command line:
+.Bl -tag -width indent
+.It Xo
+.Ic Cm capture
+.Op Fl M Ar core
+.Op Fl N Ar system
+.Cm print
+.Xc
+Print the current contents of the
+.Xr ddb 4
+output capture buffer.
+.It Xo
+.Ic Cm capture
+.Op Fl M Ar core
+.Op Fl N Ar system
+.Cm status
+.Xc
+Print the current status of the
+.Xr ddb 4
+output capture buffer.
.Sh SCRIPTING
The
.Nm
==== //depot/projects/dtrace/src/sbin/ddb/ddb.c#4 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.3 2008/04/04 07:31:43 ru Exp $");
+__FBSDID("$FreeBSD: src/sbin/ddb/ddb.c,v 1.4 2008/04/25 17:34:09 rwatson Exp $");
#include <err.h>
#include <stdio.h>
@@ -43,7 +43,9 @@
usage(void)
{
- fprintf(stderr, "usage: ddb script scriptname\n");
+ fprintf(stderr, "usage: ddb capture [-M core] [-N system] print\n");
+ fprintf(stderr, " ddb capture [-M core] [-N system] status\n");
+ fprintf(stderr, " ddb script scriptname\n");
fprintf(stderr, " ddb script scriptname=script\n");
fprintf(stderr, " ddb scripts\n");
fprintf(stderr, " ddb unscript scriptname\n");
@@ -103,7 +105,9 @@
if (argc < 1)
usage();
- if (strcmp(argv[0], "script") == 0)
+ if (strcmp(argv[0], "capture") == 0)
+ ddb_capture(argc, argv);
+ else if (strcmp(argv[0], "script") == 0)
ddb_script(argc, argv);
else if (strcmp(argv[0], "scripts") == 0)
ddb_scripts(argc, argv);
==== //depot/projects/dtrace/src/sbin/ddb/ddb.h#2 (text+ko) ====
@@ -23,12 +23,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sbin/ddb/ddb.h,v 1.1 2007/12/26 09:38:22 rwatson Exp $
+ * $FreeBSD: src/sbin/ddb/ddb.h,v 1.2 2008/04/25 17:34:09 rwatson Exp $
*/
#ifndef DDB_H
#define DDB_H
+void ddb_capture(int argc, char *argv[]);
void ddb_script(int argc, char *argv[]);
void ddb_scripts(int argc, char *argv[]);
void ddb_unscript(int argc, char *argv[]);
==== //depot/projects/dtrace/src/sys/amd64/amd64/pmap.c#41 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.614 2008/04/10 16:04:50 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $");
/*
* Manages physical address maps.
@@ -2266,7 +2266,7 @@
* the 2mpage to referencing the page table page.
*/
if ((oldpde & PG_MANAGED) != 0)
- pmap_pv_demote_pde(pmap, va, oldpde & PG_FRAME);
+ pmap_pv_demote_pde(pmap, va, oldpde & PG_PS_FRAME);
pmap_pde_demotions++;
CTR2(KTR_PMAP, "pmap_demote_pde: success for va %#lx"
@@ -2301,10 +2301,10 @@
pmap_invalidate_page(kernel_pmap, sva);
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
if (oldpde & PG_MANAGED) {
- pvh = pa_to_pvh(oldpde & PG_FRAME);
+ pvh = pa_to_pvh(oldpde & PG_PS_FRAME);
pmap_pvh_free(pvh, pmap, sva);
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
vm_page_dirty(m);
@@ -2600,7 +2600,7 @@
oldpde = newpde = *pde;
if (oldpde & PG_MANAGED) {
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
/*
* In contrast to the analogous operation on a 4KB page
@@ -2839,7 +2839,7 @@
* Promote the pv entries.
*/
if ((newpde & PG_MANAGED) != 0)
- pmap_pv_promote_pde(pmap, va, newpde & PG_FRAME);
+ pmap_pv_promote_pde(pmap, va, newpde & PG_PS_FRAME);
/*
* Propagate the PAT index to its proper position.
@@ -3820,7 +3820,7 @@
pc->pc_map[field] |= bitmask;
if ((tpte & PG_PS) != 0) {
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
- pvh = pa_to_pvh(tpte & PG_FRAME);
+ pvh = pa_to_pvh(tpte & PG_PS_FRAME);
TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
if (TAILQ_EMPTY(&pvh->pv_list)) {
for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
@@ -4029,7 +4029,7 @@
* table page.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
rtval++;
if (rtval > 4) {
@@ -4098,7 +4098,7 @@
* write access may repromote.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pte = pmap_pde_to_pte(pde, va);
oldpte = *pte;
if ((oldpte & PG_V) != 0) {
@@ -4163,7 +4163,8 @@
* fully populated, this removal never frees
* a page table page.
*/
- va += VM_PAGE_TO_PHYS(m) - (oldpde & PG_FRAME);
+ va += VM_PAGE_TO_PHYS(m) - (oldpde &
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
}
}
==== //depot/projects/dtrace/src/sys/conf/files#86 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -732,6 +732,48 @@
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
+ipwbssfw.c optional ipwbssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwbssfw.c"
+ipw_bss.fwo optional ipwbssfw | ipwfw \
+ dependency "ipw_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \
+ no-implicit-rule \
+ clean "ipw_bss.fwo"
+ipw_bss.fw optional ipwbssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_bss.fw"
+ipwibssfw.c optional ipwibssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwibssfw.c"
+ipw_ibss.fwo optional ipwibssfw | ipwfw \
+ dependency "ipw_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \
+ no-implicit-rule \
+ clean "ipw_ibss.fwo"
+ipw_ibss.fw optional ipwibssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_ibss.fw"
+ipwmonitorfw.c optional ipwmonitorfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwmonitorfw.c"
+ipw_monitor.fwo optional ipwmonitorfw | ipwfw \
+ dependency "ipw_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \
+ no-implicit-rule \
+ clean "ipw_monitor.fwo"
+ipw_monitor.fw optional ipwmonitorfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_monitor.fw"
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
@@ -746,6 +788,48 @@
dev/isp/isp_target.c optional isp
dev/ispfw/ispfw.c optional ispfw
dev/iwi/if_iwi.c optional iwi
+iwibssfw.c optional iwibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwibssfw.c"
+iwi_bss.fwo optional iwibssfw | iwifw \
+ dependency "iwi_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \
+ no-implicit-rule \
+ clean "iwi_bss.fwo"
+iwi_bss.fw optional iwibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_bss.fw"
+iwiibssfw.c optional iwiibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwiibssfw.c"
+iwi_ibss.fwo optional iwiibssfw | iwifw \
+ dependency "iwi_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \
+ no-implicit-rule \
+ clean "iwi_ibss.fwo"
+iwi_ibss.fw optional iwiibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_ibss.fw"
+iwimonitorfw.c optional iwimonitorfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwimonitorfw.c"
+iwi_monitor.fwo optional iwimonitorfw | iwifw \
+ dependency "iwi_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \
+ no-implicit-rule \
+ clean "iwi_monitor.fwo"
+iwi_monitor.fw optional iwimonitorfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_monitor.fw"
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
@@ -922,6 +1006,62 @@
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
dev/ral/if_ral_pci.c optional ral pci
+rt2561fw.c optional rt2561fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561fw.c"
+rt2561fw.fwo optional rt2561fw | ralfw \
+ dependency "rt2561.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
+ no-implicit-rule \
+ clean "rt2561.fwo"
+rt2561.fw optional rt2561fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561.fw"
+rt2561sfw.c optional rt2561sfw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561sfw.c"
+rt2561sfw.fwo optional rt2561sfw | ralfw \
+ dependency "rt2561s.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
+ no-implicit-rule \
+ clean "rt2561s.fwo"
+rt2561s.fw optional rt2561sfw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561s.fw"
+rt2661fw.c optional rt2661fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2661fw.c"
+rt2661fw.fwo optional rt2661fw | ralfw \
+ dependency "rt2661.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
+ no-implicit-rule \
+ clean "rt2661.fwo"
+rt2661.fw optional rt2661fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2661.fw"
+rt2860fw.c optional rt2860fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2860fw.c"
+rt2860fw.fwo optional rt2860fw | ralfw \
+ dependency "rt2860.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
+ no-implicit-rule \
+ clean "rt2860.fwo"
+rt2860.fw optional rt2860fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2860.fw"
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
@@ -1183,6 +1323,20 @@
dev/wi/if_wi_pccard.c optional wi pccard
dev/wi/if_wi_pci.c optional wi pci
dev/wl/if_wl.c optional wl isa
+wpifw.c optional wpifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -lintel_wpi -mwpi -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "wpifw.c"
+wpifw.fwo optional wpifw \
+ dependency "wpi.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} wpi.fw" \
+ no-implicit-rule \
+ clean "wpi.fwo"
+wpi.fw optional wpifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "wpi.fw"
dev/xe/if_xe.c optional xe
dev/xe/if_xe_pccard.c optional xe pccard
fs/coda/coda_fbsd.c optional vcoda
==== //depot/projects/dtrace/src/sys/ddb/db_capture.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5 2008/01/26 23:02:14 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.6 2008/04/25 13:23:36 rwatson Exp $");
#include "opt_ddb.h"
@@ -83,13 +83,16 @@
static SYSCTL_NODE(_debug_ddb, OID_AUTO, capture, CTLFLAG_RW, 0,
"DDB capture options");
-SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bytes, CTLFLAG_RD,
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bufoff, CTLFLAG_RD,
&db_capture_bufoff, 0, "Bytes of data in DDB capture buffer");
SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, maxbufsize, CTLFLAG_RD,
&db_capture_maxbufsize, 0,
"Maximum value for debug.ddb.capture.bufsize");
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
+ &db_capture_inprogress, 0, "DDB output capture in progress");
+
/*
* Boot-time allocation of the DDB capture buffer, if any. Force all buffer
* sizes, including the maximum size, to be rounded to block sizes.
==== //depot/projects/dtrace/src/sys/dev/acpica/acpi_thermal.c#11 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.69 2008/02/16 07:15:34 ume Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.70 2008/04/25 16:45:13 rpaulo Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -90,6 +90,7 @@
int tz_temperature; /*Current temperature*/
int tz_active; /*Current active cooling*/
#define TZ_ACTIVE_NONE -1
+#define TZ_ACTIVE_UNKNOWN -2
int tz_requested; /*Minimum active cooling*/
int tz_thflags; /*Current temp-related flags*/
#define TZ_THFLAG_NONE 0
@@ -202,7 +203,7 @@
sc->tz_dev = dev;
sc->tz_handle = acpi_get_handle(dev);
sc->tz_requested = TZ_ACTIVE_NONE;
- sc->tz_active = TZ_ACTIVE_NONE;
+ sc->tz_active = TZ_ACTIVE_UNKNOWN;
sc->tz_thflags = TZ_THFLAG_NONE;
sc->tz_cooling_proc = NULL;
sc->tz_cooling_proc_running = FALSE;
@@ -520,6 +521,7 @@
* minimum cooling run time if requested.
*/
if (acpi_tz_min_runtime > 0 && sc->tz_active != TZ_ACTIVE_NONE &&
+ sc->tz_active != TZ_ACTIVE_UNKNOWN &&
(newactive == TZ_ACTIVE_NONE || newactive > sc->tz_active)) {
getnanotime(&curtime);
@@ -543,6 +545,23 @@
newflags |= TZ_THFLAG_CRT;
/* If the active cooling state has changed, we have to switch things. */
+ if (sc->tz_active == TZ_ACTIVE_UNKNOWN) {
+ /*
+ * We don't know which cooling device is on or off,
+ * so stop them all, because we now know which
+ * should be on (if any).
+ */
+ for (i = 0; i < TZ_NUMLEVELS; i++) {
+ if (sc->tz_zone.al[i].Pointer != NULL) {
+ acpi_ForeachPackageObject(
+ (ACPI_OBJECT *)sc->tz_zone.al[i].Pointer,
+ acpi_tz_switch_cooler_off, sc);
+ }
+ }
+ /* now we know that all devices are off */
+ sc->tz_active = TZ_ACTIVE_NONE;
+ }
+
if (newactive != sc->tz_active) {
/* Turn off the cooling devices that are on, if any are */
if (sc->tz_active != TZ_ACTIVE_NONE)
==== //depot/projects/dtrace/src/sys/dev/em/e1000_82571.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
/* e1000_82571
* e1000_82572
@@ -150,6 +150,25 @@
goto out;
}
break;
+ case e1000_82574:
+ phy->type = e1000_phy_bm;
+ phy->ops.get_cfg_done = e1000_get_cfg_done_generic;
+ phy->ops.get_info = e1000_get_phy_info_m88;
+ phy->ops.commit = e1000_phy_sw_reset_generic;
+ phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_m88;
+ phy->ops.get_cable_length = e1000_get_cable_length_m88;
+ phy->ops.read_reg = e1000_read_phy_reg_bm2;
+ phy->ops.write_reg = e1000_write_phy_reg_bm2;
+
+ /* This uses above function pointers */
+ ret_val = e1000_get_phy_id_82571(hw);
+ /* Verify PHY ID */
+ if (phy->id != BME1000_E_PHY_ID_R2) {
+ ret_val = -E1000_ERR_PHY;
+ DEBUGOUT1("PHY ID unknown: type = 0x%08x\n", phy->id);
+ goto out;
+ }
+ break;
default:
ret_val = -E1000_ERR_PHY;
goto out;
@@ -193,6 +212,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
if (((eecd >> 15) & 0x3) == 0x3) {
nvm->type = e1000_nvm_flash_hw;
nvm->word_size = 2048;
@@ -374,6 +394,7 @@
{
struct e1000_phy_info *phy = &hw->phy;
s32 ret_val = E1000_SUCCESS;
+ u16 phy_id = 0;
DEBUGFUNC("e1000_get_phy_id_82571");
@@ -391,11 +412,26 @@
case e1000_82573:
ret_val = e1000_get_phy_id(hw);
break;
+ case e1000_82574:
+ ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id = (u32)(phy_id << 16);
+ usec_delay(20);
+ ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id |= (u32)(phy_id);
+ phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
+ break;
default:
ret_val = -E1000_ERR_PHY;
break;
}
+out:
return ret_val;
}
@@ -476,7 +512,7 @@
if (ret_val)
goto out;
- if (hw->mac.type != e1000_82573)
+ if (hw->mac.type != e1000_82573 && hw->mac.type != e1000_82574)
ret_val = e1000_acquire_nvm_generic(hw);
if (ret_val)
@@ -521,6 +557,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
ret_val = e1000_write_nvm_eewr_82571(hw, offset, words, data);
break;
case e1000_82571:
@@ -825,7 +862,7 @@
* Must acquire the MDIO ownership before MAC reset.
* Ownership defaults to firmware after a reset.
*/
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
extcnf_ctrl = E1000_READ_REG(hw, E1000_EXTCNF_CTRL);
extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
@@ -866,7 +903,7 @@
* Need to wait for Phy configuration completion before accessing
* NVM and Phy.
*/
- if (hw->mac.type == e1000_82573)
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574)
msec_delay(25);
/* Clear any pending interrupt events. */
@@ -934,7 +971,7 @@
E1000_WRITE_REG(hw, E1000_TXDCTL(0), reg_data);
/* ...for both queues. */
- if (mac->type != e1000_82573) {
+ if (mac->type != e1000_82573 && mac->type != e1000_82574) {
reg_data = E1000_READ_REG(hw, E1000_TXDCTL(1));
reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
E1000_TXDCTL_FULL_TX_DESC_WB |
@@ -1014,14 +1051,14 @@
}
/* Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL);
reg &= ~(1 << 29);
E1000_WRITE_REG(hw, E1000_CTRL, reg);
}
/* Extended Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
reg &= ~(1 << 23);
reg |= (1 << 22);
@@ -1048,7 +1085,7 @@
DEBUGFUNC("e1000_clear_vfta_82571");
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
if (hw->mng_cookie.vlan_id != 0) {
/*
* The VFTA is a 4096b bit-field, each identifying
@@ -1121,7 +1158,8 @@
* the default flow control setting, so we explicitly
* set it to full.
*/
- if (hw->mac.type == e1000_82573 && hw->fc.type == e1000_fc_default)
+ if ((hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) &&
+ hw->fc.type == e1000_fc_default)
hw->fc.type = e1000_fc_full;
return e1000_setup_link_generic(hw);
@@ -1224,11 +1262,10 @@
goto out;
}
- if (hw->mac.type == e1000_82573 &&
+ if ((hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) &&
*data == ID_LED_RESERVED_F746)
*data = ID_LED_DEFAULT_82573;
- else if (*data == ID_LED_RESERVED_0000 ||
- *data == ID_LED_RESERVED_FFFF)
+ else if (*data == ID_LED_RESERVED_0000 || *data == ID_LED_RESERVED_FFFF)
*data = ID_LED_DEFAULT;
out:
return ret_val;
==== //depot/projects/dtrace/src/sys/dev/em/e1000_82571.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_82571.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_82571.h,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
#ifndef _E1000_82571_H_
#define _E1000_82571_H_
@@ -43,4 +43,12 @@
#define E1000_GCR_L1_ACT_WITHOUT_L0S_RX 0x08000000
+/* Intr Throttling - RW */
+#define E1000_EITR_82574(_n) (0x000E8 + (0x4 * (_n)))
+
+#define E1000_EIAC_82574 0x000DC /* Ext. Interrupt Auto Clear - RW */
+#define E1000_EIAC_MASK_82574 0x01500000
+
+#define E1000_RXCFGL 0x0B634 /* TimeSync Rx EtherType & Msg Type Reg - RW */
+
#endif
==== //depot/projects/dtrace/src/sys/dev/em/e1000_api.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_api.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_api.c,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
#include "e1000_api.h"
#include "e1000_mac.h"
@@ -216,6 +216,9 @@
case E1000_DEV_ID_82573L:
mac->type = e1000_82573;
break;
+ case E1000_DEV_ID_82574L:
+ mac->type = e1000_82574;
+ break;
case E1000_DEV_ID_80003ES2LAN_COPPER_DPT:
case E1000_DEV_ID_80003ES2LAN_SERDES_DPT:
case E1000_DEV_ID_80003ES2LAN_COPPER_SPT:
@@ -238,14 +241,24 @@
case E1000_DEV_ID_ICH9_IGP_M_AMT:
case E1000_DEV_ID_ICH9_IGP_M_V:
case E1000_DEV_ID_ICH9_IGP_AMT:
+ case E1000_DEV_ID_ICH9_BM:
case E1000_DEV_ID_ICH9_IGP_C:
+ case E1000_DEV_ID_ICH10_R_BM_LM:
+ case E1000_DEV_ID_ICH10_R_BM_LF:
+ case E1000_DEV_ID_ICH10_R_BM_V:
mac->type = e1000_ich9lan;
break;
+ case E1000_DEV_ID_ICH10_D_BM_LM:
+ case E1000_DEV_ID_ICH10_D_BM_LF:
+ mac->type = e1000_ich10lan;
+ break;
+#ifndef NO_82575_SUPPORT
case E1000_DEV_ID_82575EB_COPPER:
case E1000_DEV_ID_82575EB_FIBER_SERDES:
case E1000_DEV_ID_82575GB_QUAD_COPPER:
mac->type = e1000_82575;
break;
+#endif
default:
/* Should never have loaded on this device */
ret_val = -E1000_ERR_MAC_INIT;
@@ -323,6 +336,7 @@
case e1000_82571:
case e1000_82572:
case e1000_82573:
+ case e1000_82574:
e1000_init_function_pointers_82571(hw);
break;
case e1000_80003es2lan:
@@ -330,11 +344,14 @@
break;
case e1000_ich8lan:
case e1000_ich9lan:
+ case e1000_ich10lan:
e1000_init_function_pointers_ich8lan(hw);
break;
+#ifndef NO_82575_SUPPORT
case e1000_82575:
e1000_init_function_pointers_82575(hw);
break;
+#endif
default:
DEBUGOUT("Hardware not supported\n");
ret_val = -E1000_ERR_CONFIG;
@@ -403,7 +420,7 @@
void e1000_clear_vfta(struct e1000_hw *hw)
{
if (hw->mac.ops.clear_vfta)
- hw->mac.ops.clear_vfta (hw);
+ hw->mac.ops.clear_vfta(hw);
}
/**
==== //depot/projects/dtrace/src/sys/dev/em/e1000_api.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_api.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_api.h,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
#ifndef _E1000_API_H_
#define _E1000_API_H_
@@ -46,7 +46,9 @@
extern void e1000_init_function_pointers_82541(struct e1000_hw *hw);
extern void e1000_init_function_pointers_80003es2lan(struct e1000_hw *hw);
extern void e1000_init_function_pointers_ich8lan(struct e1000_hw *hw);
+#ifndef NO_82575_SUPPORT
extern void e1000_init_function_pointers_82575(struct e1000_hw *hw);
+#endif
s32 e1000_set_mac_type(struct e1000_hw *hw);
s32 e1000_setup_init_funcs(struct e1000_hw *hw, bool init_device);
==== //depot/projects/dtrace/src/sys/dev/em/e1000_defines.h#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_defines.h,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_defines.h,v 1.7 2008/04/25 21:19:40 jfv Exp $*/
#ifndef _E1000_DEFINES_H_
#define _E1000_DEFINES_H_
@@ -154,6 +154,7 @@
#define E1000_CTRL_EXT_DF_PAREN 0x02000000 /* descriptor FIFO parity error detection enable */
#define E1000_CTRL_EXT_GHOST_PAREN 0x40000000
#define E1000_CTRL_EXT_PBA_CLR 0x80000000 /* PBA Clear */
+#define E1000_CTRL_EXT_LSECCK 0x00001000
#define E1000_I2CCMD_REG_ADDR_SHIFT 16
#define E1000_I2CCMD_REG_ADDR 0x00FF0000
#define E1000_I2CCMD_PHY_ADDR_SHIFT 24
@@ -202,6 +203,13 @@
#define E1000_RXDEXT_STATERR_IPE 0x40000000
#define E1000_RXDEXT_STATERR_RXE 0x80000000
+#define E1000_RXDEXT_LSECH 0x01000000
+#define E1000_RXDEXT_LSECE_MASK 0x60000000
+#define E1000_RXDEXT_LSECE_NO_ERROR 0x00000000
+#define E1000_RXDEXT_LSECE_NO_SA_MATCH 0x20000000
+#define E1000_RXDEXT_LSECE_REPLAY_DETECT 0x40000000
+#define E1000_RXDEXT_LSECE_BAD_SIG 0x60000000
+
/* mask to determine if packets should be dropped due to frame errors */
#define E1000_RXD_ERR_FRAME_ERR_MASK ( \
E1000_RXD_ERR_CE | \
@@ -397,6 +405,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 22:56:58 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id B98D01065685; Fri, 25 Apr 2008 22:56:58 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 79ECE1065676
for <perforce@freebsd.org>; Fri, 25 Apr 2008 22:56:58 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 71E038FC16
for <perforce@freebsd.org>; Fri, 25 Apr 2008 22:56:58 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PMuwJt005664
for <perforce@freebsd.org>; Fri, 25 Apr 2008 22:56:58 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PMuwcx005662
for perforce@freebsd.org; Fri, 25 Apr 2008 22:56:58 GMT
(envelope-from jb@freebsd.org)
Date: Fri, 25 Apr 2008 22:56:58 GMT
Message-Id: <200804252256.m3PMuwcx005662@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140644 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 22:56:59 -0000
http://perforce.freebsd.org/chv.cgi?CH=140644
Change 140644 by jb@freebsd3 on 2008/04/25 22:56:47
IF7
Affected files ...
.. //depot/projects/dtrace7/src/contrib/hostapd/ChangeLog#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/Makefile#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/README#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/aes_wrap.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/aes_wrap.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/common.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/common.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/defconfig#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/driver.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/driver_test.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/driver_wired.c#2 delete
.. //depot/projects/dtrace7/src/contrib/hostapd/eap_aka.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/eap_gpsk.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/eap_gpsk_common.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/eap_gpsk_common.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/eap_sim.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/eap_sim_common.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/eap_sim_db.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/eap_tls_common.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/hostapd.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/hostapd.conf#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/ieee802_11.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/ieee802_11_auth.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/ieee802_1x.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/madwifi.conf#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/os.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/os_unix.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/radius.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/radius.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/radius_client.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/radius_server.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/tls_openssl.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/version.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/hostapd/wpa.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/ChangeLog#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/FREEBSD-Xlist#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/FREEBSD-upgrade#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/Makefile#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/README#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/aes_wrap.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/aes_wrap.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/asn1.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/common.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/common.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/config.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/config_ssid.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/ctrl_iface.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/ctrl_iface_dbus.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/ctrl_iface_dbus_handlers.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/ctrl_iface_unix.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/dbus-wpa_supplicant.conf#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/dbus-wpa_supplicant.service#1 branch
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/defconfig#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/doc/ctrl_iface.doxygen#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/doc/docbook/wpa_background.8#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.8#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/doc/docbook/wpa_cli.sgml#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/doc/docbook/wpa_passphrase.8#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.8#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.conf.5#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/doc/docbook/wpa_supplicant.sgml#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/driver_ndis.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eap_gpsk.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eap_gpsk_common.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eap_gpsk_common.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eap_peap.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eap_sim.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eap_sim_common.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eap_tlv.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eap_tlv.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eapol_sm.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/eapol_test.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/events.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/main.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/os.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/os_unix.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/pcsc_funcs.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/radius.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/radius.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/radius_client.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/tls_openssl.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/version.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa_cli.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa_gui-qt4/networkconfig.cpp#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa_gui-qt4/wpagui.cpp#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa_gui/networkconfig.ui.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa_gui/setup-mingw-cross-compiling#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa_gui/wpagui.ui.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa_supplicant.c#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa_supplicant.conf#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/wpa_supplicant_i.h#2 integrate
.. //depot/projects/dtrace7/src/contrib/wpa_supplicant/x509v3.c#2 integrate
.. //depot/projects/dtrace7/src/etc/rc.d/wpa_supplicant#2 integrate
.. //depot/projects/dtrace7/src/sbin/dhclient/dhclient.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/ifconfig/ifclone.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/ifconfig/ifconfig.c#3 integrate
.. //depot/projects/dtrace7/src/sbin/ifconfig/ifconfig.h#2 integrate
.. //depot/projects/dtrace7/src/sbin/ifconfig/ifvlan.c#2 integrate
.. //depot/projects/dtrace7/src/sbin/ipfw/ipfw.8#5 integrate
.. //depot/projects/dtrace7/src/sbin/ipfw/ipfw2.c#5 integrate
.. //depot/projects/dtrace7/src/share/man/man4/uart.4#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/conf/AVILA.hints#2 integrate
.. //depot/projects/dtrace7/src/sys/arm/xscale/ixp425/ixdp425_pci.c#2 integrate
.. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/common/atomic/sparc64/atomic.S#2 integrate
.. //depot/projects/dtrace7/src/sys/cddl/contrib/opensolaris/uts/common/sys/asm_linkage.h#3 integrate
.. //depot/projects/dtrace7/src/sys/conf/files#9 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_command.c#4 integrate
.. //depot/projects/dtrace7/src/sys/ddb/db_ps.c#2 integrate
.. //depot/projects/dtrace7/src/sys/ddb/ddb.h#4 integrate
.. //depot/projects/dtrace7/src/sys/dev/ath/if_ath.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/ral/rt2661.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/uart/uart.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/uart/uart_dev_ns8250.c#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/ucom.c#3 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/ucomvar.h#2 integrate
.. //depot/projects/dtrace7/src/sys/dev/usb/usbdevs#6 integrate
.. //depot/projects/dtrace7/src/sys/modules/Makefile#9 integrate
.. //depot/projects/dtrace7/src/sys/modules/zfs/Makefile#6 integrate
.. //depot/projects/dtrace7/src/sys/net/if_bridge.c#4 integrate
.. //depot/projects/dtrace7/src/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/dtrace7/src/sys/net/if_media.h#2 integrate
.. //depot/projects/dtrace7/src/sys/net80211/ieee80211_scan_sta.c#3 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_dummynet.h#2 integrate
.. //depot/projects/dtrace7/src/sys/netinet/ip_fw_pfil.c#3 integrate
.. //depot/projects/dtrace7/src/sys/sys/cdefs.h#3 integrate
.. //depot/projects/dtrace7/src/sys/sys/mbuf.h#3 integrate
.. //depot/projects/dtrace7/src/usr.sbin/arp/arp.8#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/arp/arp.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/Makefile#4 integrate
.. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/driver_freebsd.c#2 integrate
.. //depot/projects/dtrace7/src/usr.sbin/wpa/wpa_supplicant/wpa_supplicant.8#3 integrate
Differences ...
==== //depot/projects/dtrace7/src/contrib/hostapd/ChangeLog#2 (text+ko) ====
@@ -1,5 +1,25 @@
ChangeLog for hostapd
+2008-02-19 - v0.5.10
+ * fixed EAP-SIM and EAP-AKA message parser to validate attribute
+ lengths properly to avoid potential crash caused by invalid messages
+ * fixed Reassociation Response callback processing when using internal
+ MLME (driver_{hostap,devicescape,test}.c)
+ * fixed EAP-SIM/AKA realm processing to allow decorated usernames to
+ be used
+ * added a workaround for EAP-SIM/AKA peers that include incorrect null
+ termination in the username
+ * fixed EAP-SIM Start response processing for fast reauthentication
+ case
+ * copy optional Proxy-State attributes into RADIUS response when acting
+ as a RADIUS authentication server
+
+2007-12-02 - v0.5.9
+ * updated EAP Generalized Pre-Shared Key (EAP-GPSK) to use the latest
+ draft (draft-ietf-emu-eap-gpsk-07.txt)
+ * fixed debugging code not to use potentially unaligned read to fetch
+ IPv4 addresses
+
2007-05-28 - v0.5.8
* updated driver_devicescape.c to build with the current
wireless-dev.git tree and net/d80211 changes
==== //depot/projects/dtrace7/src/contrib/hostapd/Makefile#2 (text+ko) ====
@@ -313,6 +313,10 @@
CFLAGS += -DCONFIG_IPV6
endif
+ifdef CONFIG_DRIVER_RADIUS_ACL
+CFLAGS += -DCONFIG_DRIVER_RADIUS_ACL
+endif
+
ifdef CONFIG_FULL_DYNAMIC_VLAN
# define CONFIG_FULL_DYNAMIC_VLAN to have hostapd manipulate bridges
# and vlan interfaces for the vlan feature.
==== //depot/projects/dtrace7/src/contrib/hostapd/README#2 (text+ko) ====
@@ -2,7 +2,7 @@
Authenticator and RADIUS authentication server
================================================================
-Copyright (c) 2002-2007, Jouni Malinen <j@w1.fi> and contributors
+Copyright (c) 2002-2008, Jouni Malinen <j@w1.fi> and contributors
All Rights Reserved.
This program is dual-licensed under both the GPL version 2 and BSD
==== //depot/projects/dtrace7/src/contrib/hostapd/aes_wrap.c#2 (text+ko) ====
@@ -7,7 +7,7 @@
* - AES-128 EAX mode encryption/decryption
* - AES-128 CBC
*
- * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -34,10 +34,11 @@
/**
* aes_wrap - Wrap keys with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
- * @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @plain: Plaintext key to be wrapped, n * 64 bit
- * @cipher: Wrapped key, (n + 1) * 64 bit
+ * @kek: 16-octet Key encryption key (KEK)
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @plain: Plaintext key to be wrapped, n * 64 bits
+ * @cipher: Wrapped key, (n + 1) * 64 bits
* Returns: 0 on success, -1 on failure
*/
int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher)
@@ -93,9 +94,10 @@
/**
* aes_unwrap - Unwrap key with AES Key Wrap Algorithm (128-bit KEK) (RFC3394)
* @kek: Key encryption key (KEK)
- * @n: Length of the wrapped key in 64-bit units; e.g., 2 = 128-bit = 16 bytes
- * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bit
- * @plain: Plaintext key, n * 64 bit
+ * @n: Length of the plaintext key in 64-bit units; e.g., 2 = 128-bit = 16
+ * bytes
+ * @cipher: Wrapped key to be unwrapped, (n + 1) * 64 bits
+ * @plain: Plaintext key, n * 64 bits
* Returns: 0 on success, -1 on failure (e.g., integrity verification failed)
*/
int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain)
@@ -167,28 +169,45 @@
/**
- * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * omac1_aes_128_vector - One-Key CBC MAC (OMAC1) hash with AES-128
* @key: 128-bit key for the hash operation
- * @data: Data buffer for which a MAC is determined
- * @data: Length of data buffer in bytes
+ * @num_elem: Number of elements in the data vector
+ * @addr: Pointers to the data areas
+ * @len: Lengths of the data blocks
* @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
* Returns: 0 on success, -1 on failure
*/
-int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+ const u8 *addr[], const size_t *len, u8 *mac)
{
void *ctx;
u8 cbc[BLOCK_SIZE], pad[BLOCK_SIZE];
- const u8 *pos = data;
- size_t i, left = data_len;
+ const u8 *pos, *end;
+ size_t i, e, left, total_len;
ctx = aes_encrypt_init(key, 16);
if (ctx == NULL)
return -1;
os_memset(cbc, 0, BLOCK_SIZE);
+ total_len = 0;
+ for (e = 0; e < num_elem; e++)
+ total_len += len[e];
+ left = total_len;
+
+ e = 0;
+ pos = addr[0];
+ end = pos + len[0];
+
while (left >= BLOCK_SIZE) {
- for (i = 0; i < BLOCK_SIZE; i++)
+ for (i = 0; i < BLOCK_SIZE; i++) {
cbc[i] ^= *pos++;
+ if (pos >= end) {
+ e++;
+ pos = addr[e];
+ end = pos + len[e];
+ }
+ }
if (left > BLOCK_SIZE)
aes_encrypt(ctx, cbc, cbc);
left -= BLOCK_SIZE;
@@ -198,9 +217,15 @@
aes_encrypt(ctx, pad, pad);
gf_mulx(pad);
- if (left || data_len == 0) {
- for (i = 0; i < left; i++)
+ if (left || total_len == 0) {
+ for (i = 0; i < left; i++) {
cbc[i] ^= *pos++;
+ if (pos >= end) {
+ e++;
+ pos = addr[e];
+ end = pos + len[e];
+ }
+ }
cbc[left] ^= 0x80;
gf_mulx(pad);
}
@@ -212,6 +237,24 @@
return 0;
}
+
+/**
+ * omac1_aes_128 - One-Key CBC MAC (OMAC1) hash with AES-128 (aka AES-CMAC)
+ * @key: 128-bit key for the hash operation
+ * @data: Data buffer for which a MAC is determined
+ * @data_len: Length of data buffer in bytes
+ * @mac: Buffer for MAC (128 bits, i.e., 16 bytes)
+ * Returns: 0 on success, -1 on failure
+ *
+ * This is a mode for using block cipher (AES in this case) for authentication.
+ * OMAC1 was standardized with the name CMAC by NIST in a Special Publication
+ * (SP) 800-38B.
+ */
+int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac)
+{
+ return omac1_aes_128_vector(key, 1, &data, &data_len, mac);
+}
+
#endif /* CONFIG_NO_AES_OMAC1 */
==== //depot/projects/dtrace7/src/contrib/hostapd/aes_wrap.h#2 (text+ko) ====
@@ -7,7 +7,7 @@
* - AES-128 EAX mode encryption/decryption
* - AES-128 CBC
*
- * Copyright (c) 2003-2005, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2003-2007, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -24,6 +24,8 @@
int aes_wrap(const u8 *kek, int n, const u8 *plain, u8 *cipher);
int aes_unwrap(const u8 *kek, int n, const u8 *cipher, u8 *plain);
+int omac1_aes_128_vector(const u8 *key, size_t num_elem,
+ const u8 *addr[], const size_t *len, u8 *mac);
int omac1_aes_128(const u8 *key, const u8 *data, size_t data_len, u8 *mac);
int aes_128_encrypt_block(const u8 *key, const u8 *in, u8 *out);
int aes_128_ctr_encrypt(const u8 *key, const u8 *nonce,
==== //depot/projects/dtrace7/src/contrib/hostapd/common.c#2 (text+ko) ====
@@ -20,7 +20,6 @@
#ifdef CONFIG_DEBUG_FILE
static FILE *out_file = NULL;
#endif /* CONFIG_DEBUG_FILE */
-int wpa_debug_use_file = 0;
int wpa_debug_level = MSG_INFO;
int wpa_debug_show_keys = 0;
int wpa_debug_timestamp = 0;
@@ -344,32 +343,29 @@
}
-int wpa_debug_open_file(void)
+int wpa_debug_open_file(const char *path)
{
#ifdef CONFIG_DEBUG_FILE
- static int count = 0;
- char fname[64];
- if (!wpa_debug_use_file)
+ if (!path)
return 0;
-#ifdef _WIN32
- os_snprintf(fname, sizeof(fname), "\\Temp\\wpa_supplicant-log-%d.txt",
- count++);
-#else /* _WIN32 */
- os_snprintf(fname, sizeof(fname), "/tmp/wpa_supplicant-log-%d.txt",
- count++);
+ out_file = fopen(path, "a");
+ if (out_file == NULL) {
+ wpa_printf(MSG_ERROR, "wpa_debug_open_file: Failed to open "
+ "output file, using standard output");
+ return -1;
+ }
+#ifndef _WIN32
+ setvbuf(out_file, NULL, _IOLBF, 0);
#endif /* _WIN32 */
- out_file = fopen(fname, "w");
- return out_file == NULL ? -1 : 0;
-#else /* CONFIG_DEBUG_FILE */
+#endif /* CONFIG_DEBUG_FILE */
return 0;
-#endif /* CONFIG_DEBUG_FILE */
}
void wpa_debug_close_file(void)
{
#ifdef CONFIG_DEBUG_FILE
- if (!wpa_debug_use_file)
+ if (!out_file)
return;
fclose(out_file);
out_file = NULL;
==== //depot/projects/dtrace7/src/contrib/hostapd/common.h#2 (text+ko) ====
@@ -264,12 +264,12 @@
#define wpa_hexdump_key(l,t,b,le) do { } while (0)
#define wpa_hexdump_ascii(l,t,b,le) do { } while (0)
#define wpa_hexdump_ascii_key(l,t,b,le) do { } while (0)
-#define wpa_debug_open_file() do { } while (0)
+#define wpa_debug_open_file(p) do { } while (0)
#define wpa_debug_close_file() do { } while (0)
#else /* CONFIG_NO_STDOUT_DEBUG */
-int wpa_debug_open_file(void);
+int wpa_debug_open_file(const char *path);
void wpa_debug_close_file(void);
/**
==== //depot/projects/dtrace7/src/contrib/hostapd/defconfig#2 (text+ko) ====
@@ -102,3 +102,7 @@
# Build IPv6 support for RADIUS operations
CONFIG_IPV6=y
+
+# Use the hostapd's IEEE 802.11 authentication (ACL), but without
+# the IEEE 802.11 Management capability
+CONFIG_DRIVER_RADIUS_ACL=y
==== //depot/projects/dtrace7/src/contrib/hostapd/driver.h#2 (text+ko) ====
@@ -141,6 +141,10 @@
* this handler will be called after initial setup has been completed.
*/
int (*commit)(void *priv);
+
+ int (*set_radius_acl_auth)(void *priv, const u8 *mac, int accepted,
+ u32 session_timeout);
+ int (*set_radius_acl_expire)(void *priv, const u8 *mac);
};
static inline int
@@ -653,4 +657,22 @@
return hapd->driver->commit(hapd->driver);
}
+static inline int
+hostapd_set_radius_acl_auth(struct hostapd_data *hapd, const u8 *mac, int accepted,
+ u32 session_timeout)
+{
+ if (hapd->driver == NULL || hapd->driver->set_radius_acl_auth == NULL)
+ return 0;
+ return hapd->driver->set_radius_acl_auth(hapd->driver, mac, accepted,
+ session_timeout);
+}
+
+static inline int
+hostapd_set_radius_acl_expire(struct hostapd_data *hapd, const u8 *mac)
+{
+ if (hapd->driver == NULL || hapd->driver->set_radius_acl_expire == NULL)
+ return 0;
+ return hapd->driver->set_radius_acl_expire(hapd->driver, mac);
+}
+
#endif /* DRIVER_H */
==== //depot/projects/dtrace7/src/contrib/hostapd/driver_test.c#2 (text+ko) ====
@@ -170,9 +170,10 @@
u16 fc;
if (drv->test_socket < 0 || len < 10 || drv->socket_dir == NULL) {
- wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%d "
- "socket_dir=%p)",
- __func__, drv->test_socket, len, drv->socket_dir);
+ wpa_printf(MSG_DEBUG, "%s: invalid parameters (sock=%d len=%lu"
+ " socket_dir=%p)",
+ __func__, drv->test_socket, (unsigned long) len,
+ drv->socket_dir);
return -1;
}
==== //depot/projects/dtrace7/src/contrib/hostapd/eap_aka.c#2 (text+ko) ====
@@ -1,6 +1,6 @@
/*
* hostapd / EAP-AKA (RFC 4187)
- * Copyright (c) 2005-2007, Jouni Malinen <j@w1.fi>
+ * Copyright (c) 2005-2008, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License version 2 as
@@ -124,6 +124,14 @@
sm->identity_len)) {
wpa_printf(MSG_DEBUG, " AT_PERMANENT_ID_REQ");
eap_sim_msg_add(msg, EAP_SIM_AT_PERMANENT_ID_REQ, 0, NULL, 0);
+ } else {
+ /*
+ * RFC 4187, Chap. 4.1.4 recommends that identity from EAP is
+ * ignored and the AKA/Identity is used to request the
+ * identity.
+ */
+ wpa_printf(MSG_DEBUG, " AT_ANY_ID_REQ");
+ eap_sim_msg_add(msg, EAP_SIM_AT_ANY_ID_REQ, 0, NULL, 0);
}
return eap_sim_msg_finish(msg, reqDataLen, NULL, NULL, 0);
}
@@ -445,10 +453,16 @@
sm->method_pending = METHOD_PENDING_NONE;
}
+ identity_len = sm->identity_len;
+ while (identity_len > 0 && sm->identity[identity_len - 1] == '\0') {
+ wpa_printf(MSG_DEBUG, "EAP-AKA: Workaround - drop last null "
+ "character from identity");
+ identity_len--;
+ }
wpa_hexdump_ascii(MSG_DEBUG, "EAP-AKA: Identity for MK derivation",
- sm->identity, sm->identity_len);
+ sm->identity, identity_len);
- eap_aka_derive_mk(sm->identity, sm->identity_len, data->ik, data->ck,
+ eap_aka_derive_mk(sm->identity, identity_len, data->ik, data->ck,
data->mk);
eap_sim_derive_keys(data->mk, data->k_encr, data->k_aut, data->msk,
data->emsk);
==== //depot/projects/dtrace7/src/contrib/hostapd/eap_gpsk.c#2 (text+ko) ====
@@ -1,5 +1,5 @@
/*
- * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-03.txt) server
+ * hostapd / EAP-GPSK (draft-ietf-emu-eap-gpsk-08.txt) server
* Copyright (c) 2006-2007, Jouni Malinen <j@w1.fi>
*
* This program is free software; you can redistribute it and/or modify
@@ -23,15 +23,15 @@
struct eap_gpsk_data {
enum { GPSK_1, GPSK_3, SUCCESS, FAILURE } state;
u8 rand_server[EAP_GPSK_RAND_LEN];
- u8 rand_client[EAP_GPSK_RAND_LEN];
+ u8 rand_peer[EAP_GPSK_RAND_LEN];
u8 msk[EAP_MSK_LEN];
u8 emsk[EAP_EMSK_LEN];
u8 sk[EAP_GPSK_MAX_SK_LEN];
size_t sk_len;
u8 pk[EAP_GPSK_MAX_PK_LEN];
size_t pk_len;
- u8 *id_client;
- size_t id_client_len;
+ u8 *id_peer;
+ size_t id_peer_len;
u8 *id_server;
size_t id_server_len;
#define MAX_NUM_CSUITES 2
@@ -85,17 +85,17 @@
data->csuite_count = 0;
if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
EAP_GPSK_CIPHER_AES)) {
- WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+ WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
EAP_GPSK_VENDOR_IETF);
- WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+ WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
EAP_GPSK_CIPHER_AES);
data->csuite_count++;
}
if (eap_gpsk_supported_ciphersuite(EAP_GPSK_VENDOR_IETF,
EAP_GPSK_CIPHER_SHA256)) {
- WPA_PUT_BE24(data->csuite_list[data->csuite_count].vendor,
+ WPA_PUT_BE32(data->csuite_list[data->csuite_count].vendor,
EAP_GPSK_VENDOR_IETF);
- WPA_PUT_BE24(data->csuite_list[data->csuite_count].specifier,
+ WPA_PUT_BE16(data->csuite_list[data->csuite_count].specifier,
EAP_GPSK_CIPHER_SHA256);
data->csuite_count++;
}
@@ -108,7 +108,7 @@
{
struct eap_gpsk_data *data = priv;
free(data->id_server);
- free(data->id_client);
+ free(data->id_peer);
free(data);
}
@@ -174,8 +174,8 @@
wpa_printf(MSG_DEBUG, "EAP-GPSK: Request/GPSK-3");
miclen = eap_gpsk_mic_len(data->vendor, data->specifier);
- len = 1 + 2 * EAP_GPSK_RAND_LEN + sizeof(struct eap_gpsk_csuite) + 2 +
- miclen;
+ len = 1 + 2 * EAP_GPSK_RAND_LEN + 2 + data->id_server_len +
+ sizeof(struct eap_gpsk_csuite) + 2 + miclen;
req = eap_msg_alloc(EAP_VENDOR_IETF, EAP_TYPE_GPSK, reqDataLen,
len, EAP_CODE_REQUEST, id, &pos);
if (req == NULL) {
@@ -188,13 +188,18 @@
*pos++ = EAP_GPSK_OPCODE_GPSK_3;
start = pos;
- memcpy(pos, data->rand_client, EAP_GPSK_RAND_LEN);
+ memcpy(pos, data->rand_peer, EAP_GPSK_RAND_LEN);
pos += EAP_GPSK_RAND_LEN;
memcpy(pos, data->rand_server, EAP_GPSK_RAND_LEN);
pos += EAP_GPSK_RAND_LEN;
+ WPA_PUT_BE16(pos, data->id_server_len);
+ pos += 2;
+ if (data->id_server)
+ memcpy(pos, data->id_server, data->id_server_len);
+ pos += data->id_server_len;
csuite = (struct eap_gpsk_csuite *) pos;
- WPA_PUT_BE24(csuite->vendor, data->vendor);
- WPA_PUT_BE24(csuite->specifier, data->specifier);
+ WPA_PUT_BE32(csuite->vendor, data->vendor);
+ WPA_PUT_BE16(csuite->specifier, data->specifier);
pos += sizeof(*csuite);
/* no PD_Payload_2 */
@@ -282,7 +287,7 @@
if (end - pos < 2) {
wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for "
- "ID_Client length");
+ "ID_Peer length");
eap_gpsk_state(data, FAILURE);
return;
}
@@ -290,21 +295,21 @@
pos += 2;
if (end - pos < alen) {
wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for "
- "ID_Client");
+ "ID_Peer");
eap_gpsk_state(data, FAILURE);
return;
}
- free(data->id_client);
- data->id_client = malloc(alen);
- if (data->id_client == NULL) {
+ free(data->id_peer);
+ data->id_peer = malloc(alen);
+ if (data->id_peer == NULL) {
wpa_printf(MSG_DEBUG, "EAP-GPSK: Not enough memory to store "
- "%d-octet ID_Client", alen);
+ "%d-octet ID_Peer", alen);
return;
}
- memcpy(data->id_client, pos, alen);
- data->id_client_len = alen;
- wpa_hexdump_ascii(MSG_DEBUG, "EAP-GPSK: ID_Client",
- data->id_client, data->id_client_len);
+ memcpy(data->id_peer, pos, alen);
+ data->id_peer_len = alen;
+ wpa_hexdump_ascii(MSG_DEBUG, "EAP-GPSK: ID_Peer",
+ data->id_peer, data->id_peer_len);
pos += alen;
if (end - pos < 2) {
@@ -332,13 +337,13 @@
if (end - pos < EAP_GPSK_RAND_LEN) {
wpa_printf(MSG_DEBUG, "EAP-GPSK: Too short message for "
- "RAND_Client");
+ "RAND_Peer");
eap_gpsk_state(data, FAILURE);
return;
}
- memcpy(data->rand_client, pos, EAP_GPSK_RAND_LEN);
- wpa_hexdump(MSG_DEBUG, "EAP-GPSK: RAND_Client",
- data->rand_client, EAP_GPSK_RAND_LEN);
+ memcpy(data->rand_peer, pos, EAP_GPSK_RAND_LEN);
+ wpa_hexdump(MSG_DEBUG, "EAP-GPSK: RAND_Peer",
+ data->rand_peer, EAP_GPSK_RAND_LEN);
pos += EAP_GPSK_RAND_LEN;
if (end - pos < EAP_GPSK_RAND_LEN) {
@@ -397,13 +402,13 @@
if (i == data->csuite_count) {
wpa_printf(MSG_DEBUG, "EAP-GPSK: Peer selected unsupported "
"ciphersuite %d:%d",
- WPA_GET_BE24(csuite->vendor),
- WPA_GET_BE24(csuite->specifier));
+ WPA_GET_BE32(csuite->vendor),
+ WPA_GET_BE16(csuite->specifier));
eap_gpsk_state(data, FAILURE);
return;
}
- data->vendor = WPA_GET_BE24(csuite->vendor);
- data->specifier = WPA_GET_BE24(csuite->specifier);
+ data->vendor = WPA_GET_BE32(csuite->vendor);
+ data->specifier = WPA_GET_BE16(csuite->specifier);
wpa_printf(MSG_DEBUG, "EAP-GPSK: CSuite_Sel %d:%d",
data->vendor, data->specifier);
pos += sizeof(*csuite);
@@ -434,8 +439,8 @@
if (eap_gpsk_derive_keys(sm->user->password, sm->user->password_len,
data->vendor, data->specifier,
- data->rand_client, data->rand_server,
- data->id_client, data->id_client_len,
+ data->rand_peer, data->rand_server,
+ data->id_peer, data->id_peer_len,
data->id_server, data->id_server_len,
data->msk, data->emsk,
data->sk, &data->sk_len,
==== //depot/projects/dtrace7/src/contrib/hostapd/eap_gpsk_common.c#2 (text+ko) ====
@@ -18,8 +18,9 @@
#include "eap_defs.h"
#include "aes_wrap.h"
#include "crypto.h"
-#include "sha1.h"
+#ifdef EAP_GPSK_SHA256
#include "sha256.h"
+#endif /* EAP_GPSK_SHA256 */
#include "eap_gpsk_common.h"
@@ -43,31 +44,29 @@
}
-static int eap_gpsk_gkdf(const u8 *psk /* Y */, size_t psk_len,
- const u8 *data /* Z */, size_t data_len,
- u8 *buf, size_t len /* X */)
+static int eap_gpsk_gkdf_cmac(const u8 *psk /* Y */,
+ const u8 *data /* Z */, size_t data_len,
+ u8 *buf, size_t len /* X */)
{
u8 *opos;
size_t i, n, hashlen, left, clen;
- u8 ibuf[2], hash[SHA1_MAC_LEN];
- const u8 *addr[3];
- size_t vlen[3];
+ u8 ibuf[2], hash[16];
+ const u8 *addr[2];
+ size_t vlen[2];
- hashlen = SHA1_MAC_LEN;
- /* M_i = Hash-Function (i || Y || Z); */
+ hashlen = sizeof(hash);
+ /* M_i = MAC_Y (i || Z); (MAC = AES-CMAC-128) */
addr[0] = ibuf;
vlen[0] = sizeof(ibuf);
- addr[1] = psk;
- vlen[1] = psk_len;
- addr[2] = data;
- vlen[2] = data_len;
+ addr[1] = data;
+ vlen[1] = data_len;
opos = buf;
left = len;
n = (len + hashlen - 1) / hashlen;
for (i = 1; i <= n; i++) {
WPA_PUT_BE16(ibuf, i);
- sha1_vector(3, addr, vlen, hash);
+ omac1_aes_128_vector(psk, 2, addr, vlen, hash);
clen = left > hashlen ? hashlen : left;
os_memcpy(opos, hash, clen);
opos += clen;
@@ -78,112 +77,30 @@
}
-static int eap_gpsk_derive_keys_aes(const u8 *psk, size_t psk_len,
- const u8 *seed, size_t seed_len,
- u8 *msk, u8 *emsk, u8 *sk, size_t *sk_len,
- u8 *pk, size_t *pk_len)
-{
-#define EAP_GPSK_SK_LEN_AES 16
-#define EAP_GPSK_PK_LEN_AES 16
- u8 zero_string[1], mk[32], *pos, *data;
- u8 kdf_out[EAP_MSK_LEN + EAP_EMSK_LEN + EAP_GPSK_SK_LEN_AES +
- EAP_GPSK_PK_LEN_AES];
- size_t data_len;
-
- /*
- * inputString = RAND_Client || ID_Client || RAND_Server || ID_Server
- * (= seed)
- * KS = 16, PL = psk_len, CSuite_Sel = 0x000000 0x000001
- * MK = GKDF-32 (0x00, PL || PSK || CSuite_Sel || inputString)
- * MSK = GKDF-160 (MK, inputString)[0..63]
- * EMSK = GKDF-160 (MK, inputString)[64..127]
- * SK = GKDF-160 (MK, inputString)[128..143]
- * PK = GKDF-160 (MK, inputString)[144..159]
- * MID = GKDF-16(0x00, "Method ID" || EAP_Method_Type || CSuite_Sel ||
- * inputString)
- * Hash-Function = SHA-1 (see [RFC3174])
- * hashlen = 20 octets (160 bits)
- */
-
- os_memset(zero_string, 0, sizeof(zero_string));
-
- data_len = 2 + psk_len + 6 + seed_len;
- data = os_malloc(data_len);
- if (data == NULL)
- return -1;
- pos = data;
- WPA_PUT_BE16(pos, psk_len);
- pos += 2;
- os_memcpy(pos, psk, psk_len);
- pos += psk_len;
- WPA_PUT_BE24(pos, 0); /* CSuite/Vendor = IETF */
- pos += 3;
- WPA_PUT_BE24(pos, EAP_GPSK_CIPHER_AES); /* CSuite/Specifier */
- pos += 3;
- os_memcpy(pos, seed, seed_len); /* inputString */
- wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: Data to MK derivation (AES)",
- data, data_len);
-
- if (eap_gpsk_gkdf(zero_string, sizeof(zero_string), data, data_len,
- mk, sizeof(mk)) < 0) {
- os_free(data);
- return -1;
- }
- os_free(data);
- wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: MK", mk, sizeof(mk));
-
- if (eap_gpsk_gkdf(mk, sizeof(mk), seed, seed_len,
- kdf_out, sizeof(kdf_out)) < 0)
- return -1;
-
- pos = kdf_out;
- wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: MSK", pos, EAP_MSK_LEN);
- os_memcpy(msk, pos, EAP_MSK_LEN);
- pos += EAP_MSK_LEN;
-
- wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: EMSK", pos, EAP_EMSK_LEN);
- os_memcpy(emsk, pos, EAP_EMSK_LEN);
- pos += EAP_EMSK_LEN;
-
- wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: SK", pos, EAP_GPSK_SK_LEN_AES);
- os_memcpy(sk, pos, EAP_GPSK_SK_LEN_AES);
- *sk_len = EAP_GPSK_SK_LEN_AES;
- pos += EAP_GPSK_SK_LEN_AES;
-
- wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: PK", pos, EAP_GPSK_PK_LEN_AES);
- os_memcpy(pk, pos, EAP_GPSK_PK_LEN_AES);
- *pk_len = EAP_GPSK_PK_LEN_AES;
-
- return 0;
-}
-
-
#ifdef EAP_GPSK_SHA256
-static int eap_gpsk_gkdf_sha256(const u8 *psk /* Y */, size_t psk_len,
+static int eap_gpsk_gkdf_sha256(const u8 *psk /* Y */,
const u8 *data /* Z */, size_t data_len,
u8 *buf, size_t len /* X */)
{
u8 *opos;
size_t i, n, hashlen, left, clen;
u8 ibuf[2], hash[SHA256_MAC_LEN];
- const u8 *addr[3];
- size_t vlen[3];
+ const u8 *addr[2];
+ size_t vlen[2];
hashlen = SHA256_MAC_LEN;
- /* M_i = Hash-Function (i || Y || Z); */
+ /* M_i = MAC_Y (i || Z); (MAC = HMAC-SHA256) */
addr[0] = ibuf;
vlen[0] = sizeof(ibuf);
- addr[1] = psk;
- vlen[1] = psk_len;
- addr[2] = data;
- vlen[2] = data_len;
+ addr[1] = data;
+ vlen[1] = data_len;
opos = buf;
left = len;
n = (len + hashlen - 1) / hashlen;
for (i = 1; i <= n; i++) {
WPA_PUT_BE16(ibuf, i);
- sha256_vector(3, addr, vlen, hash);
+ hmac_sha256_vector(psk, 32, 2, addr, vlen, hash);
clen = left > hashlen ? hashlen : left;
os_memcpy(opos, hash, clen);
opos += clen;
@@ -192,37 +109,40 @@
return 0;
}
+#endif /* EAP_GPSK_SHA256 */
-static int eap_gpsk_derive_keys_sha256(const u8 *psk, size_t psk_len,
+static int eap_gpsk_derive_keys_helper(u32 csuite_specifier,
+ u8 *kdf_out, size_t kdf_out_len,
+ const u8 *psk, size_t psk_len,
const u8 *seed, size_t seed_len,
u8 *msk, u8 *emsk,
- u8 *sk, size_t *sk_len,
- u8 *pk, size_t *pk_len)
+ u8 *sk, size_t sk_len,
+ u8 *pk, size_t pk_len)
{
-#define EAP_GPSK_SK_LEN_SHA256 SHA256_MAC_LEN
-#define EAP_GPSK_PK_LEN_SHA256 SHA256_MAC_LEN
- u8 mk[SHA256_MAC_LEN], zero_string[1], *pos, *data;
- u8 kdf_out[EAP_MSK_LEN + EAP_EMSK_LEN + EAP_GPSK_SK_LEN_SHA256 +
- EAP_GPSK_PK_LEN_SHA256];
- size_t data_len;
+ u8 mk[32], *pos, *data;
+ size_t data_len, mk_len;
+ int (*gkdf)(const u8 *psk, const u8 *data, size_t data_len,
+ u8 *buf, size_t len);
- /*
- * inputString = RAND_Client || ID_Client || RAND_Server || ID_Server
- * (= seed)
- * KS = 32, PL = psk_len, CSuite_Sel = 0x000000 0x000002
- * MK = GKDF-32 (0x00, PL || PSK || CSuite_Sel || inputString)
- * MSK = GKDF-192 (MK, inputString)[0..63]
- * EMSK = GKDF-192 (MK, inputString)[64..127]
- * SK = GKDF-192 (MK, inputString)[128..159]
- * PK = GKDF-192 (MK, inputString)[160..191]
- * MID = GKDF-16(0x00, "Method ID" || EAP_Method_Type || CSuite_Sel ||
- * inputString)
- * Hash-Function = SHA256 (see [RFC4634])
- * hashlen = 32 octets (256 bits)
- */
+ gkdf = NULL;
+ switch (csuite_specifier) {
+ case EAP_GPSK_CIPHER_AES:
+ gkdf = eap_gpsk_gkdf_cmac;
+ mk_len = 16;
+ break;
+#ifdef EAP_GPSK_SHA256
+ case EAP_GPSK_CIPHER_SHA256:
+ gkdf = eap_gpsk_gkdf_sha256;
+ mk_len = SHA256_MAC_LEN;
+ break;
+#endif /* EAP_GPSK_SHA256 */
+ default:
+ return -1;
+ }
- os_memset(zero_string, 0, sizeof(zero_string));
+ if (psk_len < mk_len)
+ return -1;
data_len = 2 + psk_len + 6 + seed_len;
data = os_malloc(data_len);
@@ -233,24 +153,22 @@
pos += 2;
os_memcpy(pos, psk, psk_len);
pos += psk_len;
- WPA_PUT_BE24(pos, 0); /* CSuite/Vendor = IETF */
- pos += 3;
- WPA_PUT_BE24(pos, EAP_GPSK_CIPHER_SHA256); /* CSuite/Specifier */
- pos += 3;
+ WPA_PUT_BE32(pos, EAP_GPSK_VENDOR_IETF); /* CSuite/Vendor = IETF */
+ pos += 4;
+ WPA_PUT_BE16(pos, csuite_specifier); /* CSuite/Specifier */
+ pos += 2;
os_memcpy(pos, seed, seed_len); /* inputString */
- wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: Data to MK derivation (SHA256)",
+ wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: Data to MK derivation",
data, data_len);
- if (eap_gpsk_gkdf_sha256(zero_string, sizeof(zero_string),
- data, data_len, mk, sizeof(mk)) < 0) {
+ if (gkdf(psk, data, data_len, mk, mk_len) < 0) {
os_free(data);
return -1;
}
os_free(data);
- wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: MK", mk, sizeof(mk));
+ wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: MK", mk, mk_len);
- if (eap_gpsk_gkdf_sha256(mk, sizeof(mk), seed, seed_len,
- kdf_out, sizeof(kdf_out)) < 0)
+ if (gkdf(mk, seed, seed_len, kdf_out, kdf_out_len) < 0)
return -1;
pos = kdf_out;
@@ -262,46 +180,113 @@
os_memcpy(emsk, pos, EAP_EMSK_LEN);
pos += EAP_EMSK_LEN;
- wpa_hexdump_key(MSG_DEBUG, "EAP-GPSK: SK",
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Fri Apr 25 23:08:10 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 5A6E91065688; Fri, 25 Apr 2008 23:08:10 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 1BA4B1065674
for <perforce@freebsd.org>; Fri, 25 Apr 2008 23:08:10 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 151C58FC30
for <perforce@freebsd.org>; Fri, 25 Apr 2008 23:08:10 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3PN89DM007148
for <perforce@freebsd.org>; Fri, 25 Apr 2008 23:08:09 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3PN89R4007146
for perforce@freebsd.org; Fri, 25 Apr 2008 23:08:09 GMT
(envelope-from jb@freebsd.org)
Date: Fri, 25 Apr 2008 23:08:09 GMT
Message-Id: <200804252308.m3PN89R4007146@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140645 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 25 Apr 2008 23:08:10 -0000
http://perforce.freebsd.org/chv.cgi?CH=140645
Change 140645 by jb@freebsd3 on 2008/04/25 23:07:20
IF6
Affected files ...
.. //depot/projects/dtrace6/src/sbin/ipfw/ipfw.8#4 integrate
.. //depot/projects/dtrace6/src/sbin/ipfw/ipfw2.c#4 integrate
.. //depot/projects/dtrace6/src/sys/net/if_bridge.c#4 integrate
.. //depot/projects/dtrace6/src/sys/net/if_ethersubr.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netinet/ip_dummynet.c#2 integrate
.. //depot/projects/dtrace6/src/sys/netinet/ip_dummynet.h#2 integrate
.. //depot/projects/dtrace6/src/sys/netinet/ip_fw_pfil.c#2 integrate
Differences ...
==== //depot/projects/dtrace6/src/sbin/ipfw/ipfw.8#4 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.175.2.14 2008/04/04 18:10:50 julian Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.175.2.15 2008/04/25 10:29:26 oleg Exp $
.\"
.Dd May 4, 2007
.Dt IPFW 8
@@ -1750,6 +1750,16 @@
TCP connection, or from/to a given host, or entire subnet, or a
protocol type, etc.
.Pp
+There are two modes of dummynet operation: normal and fast.
+Normal mode tries to emulate real link: dummynet scheduler ensures packet will
+not leave pipe faster than it would be on real link with given bandwidth.
+Fast mode allows certain packets to bypass dummynet scheduler (if packet flow
+does not exceed pipe's bandwidth). Thus fast mode requires less cpu cycles
+per packet (in average) but packet latency can be significantly lower comparing
+to real link with same bandwidth. Default is normal mode, fast mode can be
+enabled by setting net.inet.ip.dummynet.io_fast sysctl(8) variable to non-zero
+value.
+.Pp
Packets belonging to the same flow are then passed to either of two
different objects, which implement the traffic regulation:
.Bl -hang -offset XXXX
@@ -2062,6 +2072,14 @@
This value is used when no
.Cm buckets
option is specified when configuring a pipe/queue.
+.It Em net.inet.ip.dummynet.io_fast : No 0
+If set to non-zero value enables "fast" mode of dummynet operation (see above).
+.It Em net.inet.ip.dummynet.io_pkt
+Number of packets passed to by dummynet.
+.It Em net.inet.ip.dummynet.io_pkt_drop
+Number of packets dropped by dummynet.
+.It Em net.inet.ip.dummynet.io_pkt_fast
+Number of packets bypassed dummynet scheduler.
.It Em net.inet.ip.dummynet.max_chain_len : No 16
Target value for the maximum number of pipes/queues in a hash bucket.
The product
==== //depot/projects/dtrace6/src/sbin/ipfw/ipfw2.c#4 (text+ko) ====
@@ -17,7 +17,7 @@
*
* NEW command line interface for IP firewall facility
*
- * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.76.2.21 2008/04/04 18:10:50 julian Exp $
+ * $FreeBSD: src/sbin/ipfw/ipfw2.c,v 1.76.2.22 2008/04/25 10:35:53 oleg Exp $
*/
#include <sys/param.h>
@@ -3541,7 +3541,7 @@
if (p.bandwidth==0) /* this is a WF2Q+ queue */
s = 0;
else
- s = ck.hz * avg_pkt_size * 8 / p.bandwidth;
+ s = (double)ck.hz * avg_pkt_size * 8 / p.bandwidth;
/*
* max idle time (in ticks) before avg queue size becomes 0.
@@ -3554,8 +3554,8 @@
if (!p.fs.lookup_step)
p.fs.lookup_step = 1;
weight = 1 - w_q;
- for (t = p.fs.lookup_step; t > 0; --t)
- weight *= weight;
+ for (t = p.fs.lookup_step; t > 1; --t)
+ weight *= 1 - w_q;
p.fs.lookup_weight = (int)(weight * (1 << SCALE_RED));
}
i = do_cmd(IP_DUMMYNET_CONFIGURE, &p, sizeof p);
==== //depot/projects/dtrace6/src/sys/net/if_bridge.c#4 (text+ko) ====
@@ -80,7 +80,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.11.2.54 2007/12/21 05:30:15 thompsa Exp $");
+__FBSDID("$FreeBSD: src/sys/net/if_bridge.c,v 1.11.2.55 2008/04/25 10:29:26 oleg Exp $");
#include "opt_inet.h"
#include "opt_inet6.h"
@@ -2949,7 +2949,7 @@
* packet will return to us via bridge_dummynet().
*/
args.oif = ifp;
- ip_dn_io_ptr(*mp, DN_TO_IFB_FWD, &args);
+ ip_dn_io_ptr(mp, DN_TO_IFB_FWD, &args);
return (error);
}
==== //depot/projects/dtrace6/src/sys/net/if_ethersubr.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*
* @(#)if_ethersubr.c 8.1 (Berkeley) 6/10/93
- * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.193.2.15 2007/09/17 17:50:49 julian Exp $
+ * $FreeBSD: src/sys/net/if_ethersubr.c,v 1.193.2.16 2008/04/25 10:29:26 oleg Exp $
*/
#include "opt_atalk.h"
@@ -497,7 +497,7 @@
*/
*m0 = NULL ;
}
- ip_dn_io_ptr(m, dst ? DN_TO_ETH_OUT: DN_TO_ETH_DEMUX, &args);
+ ip_dn_io_ptr(&m, dst ? DN_TO_ETH_OUT: DN_TO_ETH_DEMUX, &args);
return 0;
}
/*
==== //depot/projects/dtrace6/src/sys/netinet/ip_dummynet.c#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/sys/netinet/ip_dummynet.c,v 1.93.2.6 2007/03/21 17:25:15 oleg Exp $
+ * $FreeBSD: src/sys/netinet/ip_dummynet.c,v 1.93.2.7 2008/04/25 10:29:26 oleg Exp $
*/
#define DUMMYNET_DEBUG
@@ -55,6 +55,7 @@
* include files marked with XXX are probably not needed
*/
+#include <sys/limits.h>
#include <sys/param.h>
#include <sys/systm.h>
#include <sys/malloc.h>
@@ -110,6 +111,11 @@
/* Adjusted vs non-adjusted curr_time difference (ticks). */
static long tick_diff;
+static int io_fast;
+static unsigned long io_pkt;
+static unsigned long io_pkt_fast;
+static unsigned long io_pkt_drop;
+
/*
* Three heaps contain queues and pipes that the scheduler handles:
*
@@ -181,6 +187,17 @@
SYSCTL_LONG(_net_inet_ip_dummynet, OID_AUTO, tick_lost,
CTLFLAG_RD, &tick_lost, 0,
"Number of ticks coalesced by dummynet taskqueue.");
+SYSCTL_INT(_net_inet_ip_dummynet, OID_AUTO, io_fast,
+ CTLFLAG_RW, &io_fast, 0, "Enable fast dummynet io.");
+SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt,
+ CTLFLAG_RD, &io_pkt, 0,
+ "Number of packets passed to dummynet.");
+SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt_fast,
+ CTLFLAG_RD, &io_pkt_fast, 0,
+ "Number of packets bypassed dummynet scheduler.");
+SYSCTL_ULONG(_net_inet_ip_dummynet, OID_AUTO, io_pkt_drop,
+ CTLFLAG_RD, &io_pkt_drop, 0,
+ "Number of packets dropped by dummynet.");
#endif
#ifdef DUMMYNET_DEBUG
@@ -209,15 +226,15 @@
NET_ASSERT_GIANT(); \
} while (0)
-static int config_pipe(struct dn_pipe *p);
-static int ip_dn_ctl(struct sockopt *sopt);
+static int config_pipe(struct dn_pipe *p);
+static int ip_dn_ctl(struct sockopt *sopt);
-static void dummynet(void *);
-static void dummynet_flush(void);
-static void dummynet_send(struct mbuf *);
-void dummynet_drain(void);
+static void dummynet(void *);
+static void dummynet_flush(void);
+static void dummynet_send(struct mbuf *);
+void dummynet_drain(void);
static ip_dn_io_t dummynet_io;
-static void dn_rule_delete(void *);
+static void dn_rule_delete(void *);
/*
* Heap management functions.
@@ -486,7 +503,7 @@
if ((m = pipe->head) != NULL) {
pkt = dn_tag_get(m);
/*
- * XXX: Should check errors on heap_insert, by draining the
+ * XXX Should check errors on heap_insert, by draining the
* whole pipe p and hoping in the future we are more successful.
*/
heap_insert(&extract_heap, pkt->output_time, pipe);
@@ -499,8 +516,8 @@
* either a pipe (WF2Q) or a flow_queue (per-flow queueing)
*/
#define SET_TICKS(_m, q, p) \
- ((_m)->m_pkthdr.len*8*hz - (q)->numbytes + p->bandwidth - 1 ) / \
- p->bandwidth ;
+ ((_m)->m_pkthdr.len * 8 * hz - (q)->numbytes + p->bandwidth - 1) / \
+ p->bandwidth;
/*
* extract pkt from queue, compute output time (could be now)
@@ -536,59 +553,61 @@
static void
ready_event(struct dn_flow_queue *q, struct mbuf **head, struct mbuf **tail)
{
- struct mbuf *pkt;
- struct dn_pipe *p = q->fs->pipe ;
- int p_was_empty ;
+ struct mbuf *pkt;
+ struct dn_pipe *p = q->fs->pipe;
+ int p_was_empty;
+
+ DUMMYNET_LOCK_ASSERT();
+
+ if (p == NULL) {
+ printf("dummynet: ready_event- pipe is gone\n");
+ return;
+ }
+ p_was_empty = (p->head == NULL);
+
+ /*
+ * Schedule fixed-rate queues linked to this pipe:
+ * account for the bw accumulated since last scheduling, then
+ * drain as many pkts as allowed by q->numbytes and move to
+ * the delay line (in p) computing output time.
+ * bandwidth==0 (no limit) means we can drain the whole queue,
+ * setting len_scaled = 0 does the job.
+ */
+ q->numbytes += (curr_time - q->sched_time) * p->bandwidth;
+ while ((pkt = q->head) != NULL) {
+ int len = pkt->m_pkthdr.len;
+ int len_scaled = p->bandwidth ? len * 8 * hz : 0;
- DUMMYNET_LOCK_ASSERT();
+ if (len_scaled > q->numbytes)
+ break;
+ q->numbytes -= len_scaled;
+ move_pkt(pkt, q, p, len);
+ }
+ /*
+ * If we have more packets queued, schedule next ready event
+ * (can only occur when bandwidth != 0, otherwise we would have
+ * flushed the whole queue in the previous loop).
+ * To this purpose we record the current time and compute how many
+ * ticks to go for the finish time of the packet.
+ */
+ if ((pkt = q->head) != NULL) { /* this implies bandwidth != 0 */
+ dn_key t = SET_TICKS(pkt, q, p); /* ticks i have to wait */
- if (p == NULL) {
- printf("dummynet: ready_event- pipe is gone\n");
- return ;
- }
- p_was_empty = (p->head == NULL) ;
+ q->sched_time = curr_time;
+ heap_insert(&ready_heap, curr_time + t, (void *)q);
+ /*
+ * XXX Should check errors on heap_insert, and drain the whole
+ * queue on error hoping next time we are luckier.
+ */
+ } else /* RED needs to know when the queue becomes empty. */
+ q->q_time = curr_time;
- /*
- * schedule fixed-rate queues linked to this pipe:
- * Account for the bw accumulated since last scheduling, then
- * drain as many pkts as allowed by q->numbytes and move to
- * the delay line (in p) computing output time.
- * bandwidth==0 (no limit) means we can drain the whole queue,
- * setting len_scaled = 0 does the job.
- */
- q->numbytes += ( curr_time - q->sched_time ) * p->bandwidth;
- while ( (pkt = q->head) != NULL ) {
- int len = pkt->m_pkthdr.len;
- int len_scaled = p->bandwidth ? len*8*hz : 0 ;
- if (len_scaled > q->numbytes )
- break ;
- q->numbytes -= len_scaled ;
- move_pkt(pkt, q, p, len);
- }
- /*
- * If we have more packets queued, schedule next ready event
- * (can only occur when bandwidth != 0, otherwise we would have
- * flushed the whole queue in the previous loop).
- * To this purpose we record the current time and compute how many
- * ticks to go for the finish time of the packet.
- */
- if ( (pkt = q->head) != NULL ) { /* this implies bandwidth != 0 */
- dn_key t = SET_TICKS(pkt, q, p); /* ticks i have to wait */
- q->sched_time = curr_time ;
- heap_insert(&ready_heap, curr_time + t, (void *)q );
- /* XXX should check errors on heap_insert, and drain the whole
- * queue on error hoping next time we are luckier.
+ /*
+ * If the delay line was empty call transmit_event() now.
+ * Otherwise, the scheduler will take care of it.
*/
- } else { /* RED needs to know when the queue becomes empty */
- q->q_time = curr_time;
- q->numbytes = 0;
- }
- /*
- * If the delay line was empty call transmit_event() now.
- * Otherwise, the scheduler will take care of it.
- */
- if (p_was_empty)
- transmit_event(p, head, tail);
+ if (p_was_empty)
+ transmit_event(p, head, tail);
}
/*
@@ -596,123 +615,147 @@
* the queues at their start time, and enqueue into the delay line.
* Packets are drained until p->numbytes < 0. As long as
* len_scaled >= p->numbytes, the packet goes into the delay line
- * with a deadline p->delay. For the last packet, if p->numbytes<0,
+ * with a deadline p->delay. For the last packet, if p->numbytes < 0,
* there is an additional delay.
*/
static void
ready_event_wfq(struct dn_pipe *p, struct mbuf **head, struct mbuf **tail)
{
- int p_was_empty = (p->head == NULL) ;
- struct dn_heap *sch = &(p->scheduler_heap);
- struct dn_heap *neh = &(p->not_eligible_heap) ;
+ int p_was_empty = (p->head == NULL);
+ struct dn_heap *sch = &(p->scheduler_heap);
+ struct dn_heap *neh = &(p->not_eligible_heap);
+ int64_t p_numbytes = p->numbytes;
- DUMMYNET_LOCK_ASSERT();
+ DUMMYNET_LOCK_ASSERT();
- if (p->if_name[0] == 0) /* tx clock is simulated */
- p->numbytes += ( curr_time - p->sched_time ) * p->bandwidth;
- else { /* tx clock is for real, the ifq must be empty or this is a NOP */
- if (p->ifp && p->ifp->if_snd.ifq_head != NULL)
- return ;
- else {
- DPRINTF(("dummynet: pipe %d ready from %s --\n",
- p->pipe_nr, p->if_name));
+ if (p->if_name[0] == 0) /* tx clock is simulated */
+ /*
+ * Since result may not fit into p->numbytes (32bit) we
+ * are using 64bit var here.
+ */
+ p_numbytes += (curr_time - p->sched_time) * p->bandwidth;
+ else { /*
+ * tx clock is for real,
+ * the ifq must be empty or this is a NOP.
+ */
+ if (p->ifp && p->ifp->if_snd.ifq_head != NULL)
+ return;
+ else {
+ DPRINTF(("dummynet: pipe %d ready from %s --\n",
+ p->pipe_nr, p->if_name));
+ }
}
- }
+
+ /*
+ * While we have backlogged traffic AND credit, we need to do
+ * something on the queue.
+ */
+ while (p_numbytes >= 0 && (sch->elements > 0 || neh->elements > 0)) {
+ if (sch->elements > 0) {
+ /* Have some eligible pkts to send out. */
+ struct dn_flow_queue *q = sch->p[0].object;
+ struct mbuf *pkt = q->head;
+ struct dn_flow_set *fs = q->fs;
+ uint64_t len = pkt->m_pkthdr.len;
+ int len_scaled = p->bandwidth ? len * 8 * hz : 0;
- /*
- * While we have backlogged traffic AND credit, we need to do
- * something on the queue.
- */
- while ( p->numbytes >=0 && (sch->elements>0 || neh->elements >0) ) {
- if (sch->elements > 0) { /* have some eligible pkts to send out */
- struct dn_flow_queue *q = sch->p[0].object ;
- struct mbuf *pkt = q->head;
- struct dn_flow_set *fs = q->fs;
- u_int64_t len = pkt->m_pkthdr.len;
- int len_scaled = p->bandwidth ? len*8*hz : 0 ;
+ heap_extract(sch, NULL); /* Remove queue from heap. */
+ p_numbytes -= len_scaled;
+ move_pkt(pkt, q, p, len);
- heap_extract(sch, NULL); /* remove queue from heap */
- p->numbytes -= len_scaled ;
- move_pkt(pkt, q, p, len);
+ p->V += (len << MY_M) / p->sum; /* Update V. */
+ q->S = q->F; /* Update start time. */
+ if (q->len == 0) {
+ /* Flow not backlogged any more. */
+ fs->backlogged--;
+ heap_insert(&(p->idle_heap), q->F, q);
+ } else {
+ /* Still backlogged. */
- p->V += (len<<MY_M) / p->sum ; /* update V */
- q->S = q->F ; /* update start time */
- if (q->len == 0) { /* Flow not backlogged any more */
- fs->backlogged-- ;
- heap_insert(&(p->idle_heap), q->F, q);
- } else { /* still backlogged */
+ /*
+ * Update F and position in backlogged queue,
+ * then put flow in not_eligible_heap
+ * (we will fix this later).
+ */
+ len = (q->head)->m_pkthdr.len;
+ q->F += (len << MY_M) / (uint64_t)fs->weight;
+ if (DN_KEY_LEQ(q->S, p->V))
+ heap_insert(neh, q->S, q);
+ else
+ heap_insert(sch, q->F, q);
+ }
+ }
/*
- * update F and position in backlogged queue, then
- * put flow in not_eligible_heap (we will fix this later).
+ * Now compute V = max(V, min(S_i)). Remember that all elements
+ * in sch have by definition S_i <= V so if sch is not empty,
+ * V is surely the max and we must not update it. Conversely,
+ * if sch is empty we only need to look at neh.
*/
- len = (q->head)->m_pkthdr.len;
- q->F += (len<<MY_M)/(u_int64_t) fs->weight ;
- if (DN_KEY_LEQ(q->S, p->V))
- heap_insert(neh, q->S, q);
- else
- heap_insert(sch, q->F, q);
- }
+ if (sch->elements == 0 && neh->elements > 0)
+ p->V = MAX64(p->V, neh->p[0].key);
+ /* Move from neh to sch any packets that have become eligible */
+ while (neh->elements > 0 && DN_KEY_LEQ(neh->p[0].key, p->V)) {
+ struct dn_flow_queue *q = neh->p[0].object;
+ heap_extract(neh, NULL);
+ heap_insert(sch, q->F, q);
+ }
+
+ if (p->if_name[0] != '\0') { /* Tx clock is from a real thing */
+ p_numbytes = -1; /* Mark not ready for I/O. */
+ break;
+ }
}
- /*
- * now compute V = max(V, min(S_i)). Remember that all elements in sch
- * have by definition S_i <= V so if sch is not empty, V is surely
- * the max and we must not update it. Conversely, if sch is empty
- * we only need to look at neh.
- */
- if (sch->elements == 0 && neh->elements > 0)
- p->V = MAX64 ( p->V, neh->p[0].key );
- /* move from neh to sch any packets that have become eligible */
- while (neh->elements > 0 && DN_KEY_LEQ(neh->p[0].key, p->V) ) {
- struct dn_flow_queue *q = neh->p[0].object ;
- heap_extract(neh, NULL);
- heap_insert(sch, q->F, q);
- }
+ if (sch->elements == 0 && neh->elements == 0 && p_numbytes >= 0 &&
+ p->idle_heap.elements > 0) {
+ /*
+ * No traffic and no events scheduled.
+ * We can get rid of idle-heap.
+ */
+ int i;
+
+ for (i = 0; i < p->idle_heap.elements; i++) {
+ struct dn_flow_queue *q = p->idle_heap.p[i].object;
- if (p->if_name[0] != '\0') {/* tx clock is from a real thing */
- p->numbytes = -1 ; /* mark not ready for I/O */
- break ;
+ q->F = 0;
+ q->S = q->F + 1;
+ }
+ p->sum = 0;
+ p->V = 0;
+ p->idle_heap.elements = 0;
}
- }
- if (sch->elements == 0 && neh->elements == 0 && p->numbytes >= 0
- && p->idle_heap.elements > 0) {
/*
- * no traffic and no events scheduled. We can get rid of idle-heap.
+ * If we are getting clocks from dummynet (not a real interface) and
+ * If we are under credit, schedule the next ready event.
+ * Also fix the delivery time of the last packet.
*/
- int i ;
+ if (p->if_name[0]==0 && p_numbytes < 0) { /* This implies bw > 0. */
+ dn_key t = 0; /* Number of ticks i have to wait. */
- for (i = 0 ; i < p->idle_heap.elements ; i++) {
- struct dn_flow_queue *q = p->idle_heap.p[i].object ;
+ if (p->bandwidth > 0)
+ t = (p->bandwidth - 1 - p_numbytes) / p->bandwidth;
+ dn_tag_get(p->tail)->output_time += t;
+ p->sched_time = curr_time;
+ heap_insert(&wfq_ready_heap, curr_time + t, (void *)p);
+ /*
+ * XXX Should check errors on heap_insert, and drain the whole
+ * queue on error hoping next time we are luckier.
+ */
+ }
- q->F = 0 ;
- q->S = q->F + 1 ;
- }
- p->sum = 0 ;
- p->V = 0 ;
- p->idle_heap.elements = 0 ;
- }
- /*
- * If we are getting clocks from dummynet (not a real interface) and
- * If we are under credit, schedule the next ready event.
- * Also fix the delivery time of the last packet.
- */
- if (p->if_name[0]==0 && p->numbytes < 0) { /* this implies bandwidth >0 */
- dn_key t=0 ; /* number of ticks i have to wait */
+ /* Fit (adjust if necessary) 64bit result into 32bit variable. */
+ if (p_numbytes > INT_MAX)
+ p->numbytes = INT_MAX;
+ else if (p_numbytes < INT_MIN)
+ p->numbytes = INT_MIN;
+ else
+ p->numbytes = p_numbytes;
- if (p->bandwidth > 0)
- t = ( p->bandwidth -1 - p->numbytes) / p->bandwidth ;
- dn_tag_get(p->tail)->output_time += t ;
- p->sched_time = curr_time ;
- heap_insert(&wfq_ready_heap, curr_time + t, (void *)p);
- /* XXX should check errors on heap_insert, and drain the whole
- * queue on error hoping next time we are luckier.
+ /*
+ * If the delay line was empty call transmit_event() now.
+ * Otherwise, the scheduler will take care of it.
*/
- }
- /*
- * If the delay line was empty call transmit_event() now.
- * Otherwise, the scheduler will take care of it.
- */
- if (p_was_empty)
- transmit_event(p, head, tail);
+ if (p_was_empty)
+ transmit_event(p, head, tail);
}
/*
@@ -956,29 +999,28 @@
static struct dn_flow_queue *
create_queue(struct dn_flow_set *fs, int i)
{
- struct dn_flow_queue *q ;
+ struct dn_flow_queue *q;
- if (fs->rq_elements > fs->rq_size * dn_max_ratio &&
+ if (fs->rq_elements > fs->rq_size * dn_max_ratio &&
expire_queues(fs) == 0) {
- /*
- * No way to get room, use or create overflow queue.
- */
- i = fs->rq_size ;
- if ( fs->rq[i] != NULL )
- return fs->rq[i] ;
- }
- q = malloc(sizeof(*q), M_DUMMYNET, M_NOWAIT | M_ZERO);
- if (q == NULL) {
- printf("dummynet: sorry, cannot allocate queue for new flow\n");
- return NULL ;
- }
- q->fs = fs ;
- q->hash_slot = i ;
- q->next = fs->rq[i] ;
- q->S = q->F + 1; /* hack - mark timestamp as invalid */
- fs->rq[i] = q ;
- fs->rq_elements++ ;
- return q ;
+ /* No way to get room, use or create overflow queue. */
+ i = fs->rq_size;
+ if (fs->rq[i] != NULL)
+ return fs->rq[i];
+ }
+ q = malloc(sizeof(*q), M_DUMMYNET, M_NOWAIT | M_ZERO);
+ if (q == NULL) {
+ printf("dummynet: sorry, cannot allocate queue for new flow\n");
+ return (NULL);
+ }
+ q->fs = fs;
+ q->hash_slot = i;
+ q->next = fs->rq[i];
+ q->S = q->F + 1; /* hack - mark timestamp as invalid. */
+ q->numbytes = io_fast ? fs->pipe->bandwidth : 0;
+ fs->rq[i] = q;
+ fs->rq_elements++;
+ return (q);
}
/*
@@ -1233,185 +1275,201 @@
* NULL in ip_input, destination interface in ip_output,
* real_dst in bdg_forward
* rule matching rule, in case of multiple passes
- *
*/
static int
-dummynet_io(struct mbuf *m, int dir, struct ip_fw_args *fwa)
+dummynet_io(struct mbuf **m0, int dir, struct ip_fw_args *fwa)
{
- struct mbuf *head = NULL, *tail = NULL;
- struct dn_pkt_tag *pkt;
- struct m_tag *mtag;
- struct dn_flow_set *fs = NULL;
- struct dn_pipe *pipe ;
- u_int64_t len = m->m_pkthdr.len ;
- struct dn_flow_queue *q = NULL ;
- int is_pipe;
- ipfw_insn *cmd = ACTION_PTR(fwa->rule);
+ struct mbuf *m = *m0, *head = NULL, *tail = NULL;
+ struct dn_pkt_tag *pkt;
+ struct m_tag *mtag;
+ struct dn_flow_set *fs = NULL;
+ struct dn_pipe *pipe;
+ uint64_t len = m->m_pkthdr.len;
+ struct dn_flow_queue *q = NULL;
+ int is_pipe;
+ ipfw_insn *cmd = ACTION_PTR(fwa->rule);
- KASSERT(m->m_nextpkt == NULL,
- ("dummynet_io: mbuf queue passed to dummynet"));
+ KASSERT(m->m_nextpkt == NULL,
+ ("dummynet_io: mbuf queue passed to dummynet"));
- if (cmd->opcode == O_LOG)
- cmd += F_LEN(cmd);
- if (cmd->opcode == O_ALTQ)
- cmd += F_LEN(cmd);
- if (cmd->opcode == O_TAG)
- cmd += F_LEN(cmd);
- is_pipe = (cmd->opcode == O_PIPE);
+ if (cmd->opcode == O_LOG)
+ cmd += F_LEN(cmd);
+ if (cmd->opcode == O_ALTQ)
+ cmd += F_LEN(cmd);
+ if (cmd->opcode == O_TAG)
+ cmd += F_LEN(cmd);
+ is_pipe = (cmd->opcode == O_PIPE);
- DUMMYNET_LOCK();
- /*
- * This is a dummynet rule, so we expect an O_PIPE or O_QUEUE rule.
- *
- * XXXGL: probably the pipe->fs and fs->pipe logic here
- * below can be simplified.
- */
- if (is_pipe) {
- pipe = locate_pipe(fwa->cookie);
- if (pipe != NULL)
- fs = &(pipe->fs);
- } else
- fs = locate_flowset(fwa->cookie);
+ DUMMYNET_LOCK();
+ io_pkt++;
+ /*
+ * This is a dummynet rule, so we expect an O_PIPE or O_QUEUE rule.
+ *
+ * XXXGL: probably the pipe->fs and fs->pipe logic here
+ * below can be simplified.
+ */
+ if (is_pipe) {
+ pipe = locate_pipe(fwa->cookie);
+ if (pipe != NULL)
+ fs = &(pipe->fs);
+ } else
+ fs = locate_flowset(fwa->cookie);
- if (fs == NULL)
- goto dropit; /* This queue/pipe does not exist! */
- pipe = fs->pipe;
- if (pipe == NULL) { /* Must be a queue, try find a matching pipe. */
- pipe = locate_pipe(fs->parent_nr);
- if (pipe != NULL)
- fs->pipe = pipe;
- else {
- printf("dummynet: no pipe %d for queue %d, drop pkt\n",
- fs->parent_nr, fs->fs_nr);
- goto dropit ;
+ if (fs == NULL)
+ goto dropit; /* This queue/pipe does not exist! */
+ pipe = fs->pipe;
+ if (pipe == NULL) { /* Must be a queue, try find a matching pipe. */
+ pipe = locate_pipe(fs->parent_nr);
+ if (pipe != NULL)
+ fs->pipe = pipe;
+ else {
+ printf("dummynet: no pipe %d for queue %d, drop pkt\n",
+ fs->parent_nr, fs->fs_nr);
+ goto dropit;
+ }
}
- }
- q = find_queue(fs, &(fwa->f_id));
- if ( q == NULL )
- goto dropit ; /* cannot allocate queue */
- /*
- * update statistics, then check reasons to drop pkt
- */
- q->tot_bytes += len ;
- q->tot_pkts++ ;
- if ( fs->plr && random() < fs->plr )
- goto dropit ; /* random pkt drop */
- if ( fs->flags_fs & DN_QSIZE_IS_BYTES) {
- if (q->len_bytes > fs->qsize)
- goto dropit ; /* queue size overflow */
- } else {
- if (q->len >= fs->qsize)
- goto dropit ; /* queue count overflow */
- }
- if ( fs->flags_fs & DN_IS_RED && red_drops(fs, q, len) )
- goto dropit ;
+ q = find_queue(fs, &(fwa->f_id));
+ if (q == NULL)
+ goto dropit; /* Cannot allocate queue. */
- /* XXX expensive to zero, see if we can remove it*/
- mtag = m_tag_get(PACKET_TAG_DUMMYNET,
- sizeof(struct dn_pkt_tag), M_NOWAIT|M_ZERO);
- if ( mtag == NULL )
- goto dropit ; /* cannot allocate packet header */
- m_tag_prepend(m, mtag); /* attach to mbuf chain */
+ /* Update statistics, then check reasons to drop pkt. */
+ q->tot_bytes += len;
+ q->tot_pkts++;
+ if (fs->plr && random() < fs->plr)
+ goto dropit; /* Random pkt drop. */
+ if (fs->flags_fs & DN_QSIZE_IS_BYTES) {
+ if (q->len_bytes > fs->qsize)
+ goto dropit; /* Queue size overflow. */
+ } else {
+ if (q->len >= fs->qsize)
+ goto dropit; /* Queue count overflow. */
+ }
+ if (fs->flags_fs & DN_IS_RED && red_drops(fs, q, len))
+ goto dropit;
- pkt = (struct dn_pkt_tag *)(mtag+1);
- /* ok, i can handle the pkt now... */
- /* build and enqueue packet + parameters */
- pkt->rule = fwa->rule ;
- pkt->dn_dir = dir ;
+ /* XXX expensive to zero, see if we can remove it. */
+ mtag = m_tag_get(PACKET_TAG_DUMMYNET,
+ sizeof(struct dn_pkt_tag), M_NOWAIT | M_ZERO);
+ if (mtag == NULL)
+ goto dropit; /* Cannot allocate packet header. */
+ m_tag_prepend(m, mtag); /* Attach to mbuf chain. */
- pkt->ifp = fwa->oif;
+ pkt = (struct dn_pkt_tag *)(mtag + 1);
+ /*
+ * Ok, i can handle the pkt now...
+ * Build and enqueue packet + parameters.
+ */
+ pkt->rule = fwa->rule;
+ pkt->dn_dir = dir;
- if (q->head == NULL)
- q->head = m;
- else
- q->tail->m_nextpkt = m;
- q->tail = m;
- q->len++;
- q->len_bytes += len ;
+ pkt->ifp = fwa->oif;
- if ( q->head != m ) /* flow was not idle, we are done */
- goto done;
- /*
- * If we reach this point the flow was previously idle, so we need
- * to schedule it. This involves different actions for fixed-rate or
- * WF2Q queues.
- */
- if (is_pipe) {
- /*
- * Fixed-rate queue: just insert into the ready_heap.
- */
- dn_key t = 0 ;
- if (pipe->bandwidth)
- t = SET_TICKS(m, q, pipe);
- q->sched_time = curr_time ;
- if (t == 0) /* must process it now */
- ready_event(q, &head, &tail);
+ if (q->head == NULL)
+ q->head = m;
else
- heap_insert(&ready_heap, curr_time + t , q );
- } else {
+ q->tail->m_nextpkt = m;
+ q->tail = m;
+ q->len++;
+ q->len_bytes += len;
+
+ if (q->head != m) /* Flow was not idle, we are done. */
+ goto done;
+
+ if (q->q_time < curr_time)
+ q->numbytes = io_fast ? fs->pipe->bandwidth : 0;
+ q->q_time = curr_time;
+
/*
- * WF2Q. First, compute start time S: if the flow was idle (S=F+1)
- * set S to the virtual time V for the controlling pipe, and update
- * the sum of weights for the pipe; otherwise, remove flow from
- * idle_heap and set S to max(F,V).
- * Second, compute finish time F = S + len/weight.
- * Third, if pipe was idle, update V=max(S, V).
- * Fourth, count one more backlogged flow.
+ * If we reach this point the flow was previously idle, so we need
+ * to schedule it. This involves different actions for fixed-rate or
+ * WF2Q queues.
*/
- if (DN_KEY_GT(q->S, q->F)) { /* means timestamps are invalid */
- q->S = pipe->V ;
- pipe->sum += fs->weight ; /* add weight of new queue */
+ if (is_pipe) {
+ /* Fixed-rate queue: just insert into the ready_heap. */
+ dn_key t = 0;
+
+ if (pipe->bandwidth && m->m_pkthdr.len * 8 * hz > q->numbytes)
+ t = SET_TICKS(m, q, pipe);
+ q->sched_time = curr_time;
+ if (t == 0) /* Must process it now. */
+ ready_event(q, &head, &tail);
+ else
+ heap_insert(&ready_heap, curr_time + t , q);
} else {
- heap_extract(&(pipe->idle_heap), q);
- q->S = MAX64(q->F, pipe->V ) ;
- }
- q->F = q->S + ( len<<MY_M )/(u_int64_t) fs->weight;
+ /*
+ * WF2Q. First, compute start time S: if the flow was
+ * idle (S = F + 1) set S to the virtual time V for the
+ * controlling pipe, and update the sum of weights for the pipe;
+ * otherwise, remove flow from idle_heap and set S to max(F,V).
+ * Second, compute finish time F = S + len / weight.
+ * Third, if pipe was idle, update V = max(S, V).
+ * Fourth, count one more backlogged flow.
+ */
+ if (DN_KEY_GT(q->S, q->F)) { /* Means timestamps are invalid. */
+ q->S = pipe->V;
+ pipe->sum += fs->weight; /* Add weight of new queue. */
+ } else {
+ heap_extract(&(pipe->idle_heap), q);
+ q->S = MAX64(q->F, pipe->V);
+ }
+ q->F = q->S + (len << MY_M) / (uint64_t)fs->weight;
- if (pipe->not_eligible_heap.elements == 0 &&
- pipe->scheduler_heap.elements == 0)
- pipe->V = MAX64 ( q->S, pipe->V );
- fs->backlogged++ ;
- /*
- * Look at eligibility. A flow is not eligibile if S>V (when
- * this happens, it means that there is some other flow already
- * scheduled for the same pipe, so the scheduler_heap cannot be
- * empty). If the flow is not eligible we just store it in the
- * not_eligible_heap. Otherwise, we store in the scheduler_heap
- * and possibly invoke ready_event_wfq() right now if there is
- * leftover credit.
- * Note that for all flows in scheduler_heap (SCH), S_i <= V,
- * and for all flows in not_eligible_heap (NEH), S_i > V .
- * So when we need to compute max( V, min(S_i) ) forall i in SCH+NEH,
- * we only need to look into NEH.
- */
- if (DN_KEY_GT(q->S, pipe->V) ) { /* not eligible */
- if (pipe->scheduler_heap.elements == 0)
- printf("dummynet: ++ ouch! not eligible but empty scheduler!\n");
- heap_insert(&(pipe->not_eligible_heap), q->S, q);
- } else {
- heap_insert(&(pipe->scheduler_heap), q->F, q);
- if (pipe->numbytes >= 0) { /* pipe is idle */
- if (pipe->scheduler_heap.elements != 1)
- printf("dummynet: OUCH! pipe should have been idle!\n");
- DPRINTF(("dummynet: waking up pipe %d at %d\n",
- pipe->pipe_nr, (int)(q->F >> MY_M)));
- pipe->sched_time = curr_time ;
- ready_event_wfq(pipe, &head, &tail);
- }
+ if (pipe->not_eligible_heap.elements == 0 &&
+ pipe->scheduler_heap.elements == 0)
+ pipe->V = MAX64(q->S, pipe->V);
+ fs->backlogged++;
+ /*
+ * Look at eligibility. A flow is not eligibile if S>V (when
+ * this happens, it means that there is some other flow already
+ * scheduled for the same pipe, so the scheduler_heap cannot be
+ * empty). If the flow is not eligible we just store it in the
+ * not_eligible_heap. Otherwise, we store in the scheduler_heap
+ * and possibly invoke ready_event_wfq() right now if there is
+ * leftover credit.
+ * Note that for all flows in scheduler_heap (SCH), S_i <= V,
+ * and for all flows in not_eligible_heap (NEH), S_i > V.
+ * So when we need to compute max(V, min(S_i)) forall i in
+ * SCH+NEH, we only need to look into NEH.
+ */
+ if (DN_KEY_GT(q->S, pipe->V)) { /* Not eligible. */
+ if (pipe->scheduler_heap.elements == 0)
+ printf("dummynet: ++ ouch! not eligible but empty scheduler!\n");
+ heap_insert(&(pipe->not_eligible_heap), q->S, q);
+ } else {
+ heap_insert(&(pipe->scheduler_heap), q->F, q);
+ if (pipe->numbytes >= 0) { /* Pipe is idle. */
+ if (pipe->scheduler_heap.elements != 1)
+ printf("dummynet: OUCH! pipe should have been idle!\n");
+ DPRINTF(("dummynet: waking up pipe %d at %d\n",
+ pipe->pipe_nr, (int)(q->F >> MY_M)));
+ pipe->sched_time = curr_time;
+ ready_event_wfq(pipe, &head, &tail);
+ }
+ }
}
- }
done:
- DUMMYNET_UNLOCK();
- if (head != NULL)
- dummynet_send(head);
- return 0;
+ if (head == m && dir != DN_TO_IFB_FWD && dir != DN_TO_ETH_DEMUX &&
+ dir != DN_TO_ETH_OUT) { /* Fast io. */
+ io_pkt_fast++;
+ if (m->m_nextpkt != NULL)
+ printf("dummynet: fast io: pkt chain detected!\n");
+ head = m->m_nextpkt = NULL;
+ } else
+ *m0 = NULL; /* Normal io. */
+
+ DUMMYNET_UNLOCK();
+ if (head != NULL)
+ dummynet_send(head);
+ return (0);
dropit:
- if (q)
- q->drops++ ;
- DUMMYNET_UNLOCK();
- m_freem(m);
- return ( (fs && (fs->flags_fs & DN_NOERROR)) ? 0 : ENOBUFS);
+ io_pkt_drop++;
+ if (q)
+ q->drops++;
+ DUMMYNET_UNLOCK();
+ m_freem(m);
+ *m0 = NULL;
+ return ((fs && (fs->flags_fs & DN_NOERROR)) ? 0 : ENOBUFS);
}
/*
@@ -1729,7 +1787,7 @@
/* Flush accumulated credit for all queues. */
for (i = 0; i <= pipe->fs.rq_size; i++)
for (q = pipe->fs.rq[i]; q; q = q->next)
- q->numbytes = 0;
+ q->numbytes = io_fast ? p->bandwidth : 0;
pipe->bandwidth = p->bandwidth;
pipe->numbytes = 0; /* just in case... */
==== //depot/projects/dtrace6/src/sys/netinet/ip_dummynet.h#2 (text+ko) ====
@@ -24,7 +24,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 03:14:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 826EF10656A9; Sat, 26 Apr 2008 03:14:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 3F7BC1065681
for <perforce@freebsd.org>; Sat, 26 Apr 2008 03:14:33 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 3755A8FC15
for <perforce@freebsd.org>; Sat, 26 Apr 2008 03:14:33 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3Q3EWvH080060
for <perforce@freebsd.org>; Sat, 26 Apr 2008 03:14:32 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3Q3EVih080056
for perforce@freebsd.org; Sat, 26 Apr 2008 03:14:31 GMT
(envelope-from jb@freebsd.org)
Date: Sat, 26 Apr 2008 03:14:31 GMT
Message-Id: <200804260314.m3Q3EVih080056@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140653 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 03:14:33 -0000
http://perforce.freebsd.org/chv.cgi?CH=140653
Change 140653 by jb@freebsd3 on 2008/04/26 03:14:12
IFC.
Ugh. Contrary to a previous submit message, *THIS* is the commit that brings
all the vendor files back without the FreeBSD changes, so this project will
definitely not build until those changes are added back via cvs. Yuk.
Affected files ...
.. //depot/projects/dtrace/ports/MOVED#81 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.rw.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/_string_table.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/alist.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/debug.h#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/string_table.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/messages/sgs.ident#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#3 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/tools/common/sgsmsg.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/tools/common/string_table.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_create.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_decl.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_error.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_hash.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_impl.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_labels.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_lookup.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_open.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_types.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/common/ctf/ctf_util.c#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/nlist.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/note.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/storclass.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/head/syms.h#2 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_subr.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/list.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/memory.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/hash.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/iidesc.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/input.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/util.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/dump/dump.c#4 integrate
.. //depot/projects/dtrace/src/etc/network.subr#14 integrate
.. //depot/projects/dtrace/src/lib/libc/sys/mkdir.2#7 integrate
.. //depot/projects/dtrace/src/share/man/man5/rc.conf.5#28 integrate
.. //depot/projects/dtrace/src/sys/dev/igb/if_igb.c#4 integrate
Differences ...
==== //depot/projects/dtrace/ports/MOVED#81 (text+ko) ====
@@ -1,7 +1,7 @@
#
# MOVED - a list of (recently) moved or removed ports
#
-# $FreeBSD: ports/MOVED,v 1.1578 2008/04/25 20:23:33 miwi Exp $
+# $FreeBSD: ports/MOVED,v 1.1579 2008/04/25 23:21:08 pav Exp $
#
# Each entry consists of a single line containing the following four
# fields in the order named, separated with the pipe (`|') character:
@@ -3459,3 +3459,4 @@
net/ocaml-netclient||2008-04-25|Has expired: is part of ocaml-net
net/samplicator||2008-04-25|Has expired: Project has vanished
graphics/entice||2008-04-25|Has expired: Broken and unmaintained
+security/wpa_supplicant||2008-04-26|Obsolete, newer version in base
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#4 (text) ====
@@ -34,20 +34,15 @@
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
-#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <limits.h>
#include <fcntl.h>
#include <errno.h>
#include <signal.h>
-#if defined(sun)
#include <alloca.h>
-#endif
#include <libgen.h>
-#if defined(sun)
#include <libproc.h>
-#endif
typedef struct dtrace_cmd {
void (*dc_func)(struct dtrace_cmd *); /* function to compile arg */
@@ -97,9 +92,8 @@
static int g_status = E_SUCCESS;
static int g_grabanon = 0;
static const char *g_ofile = NULL;
-static FILE *g_ofp;
+static FILE *g_ofp = stdout;
static dtrace_hdl_t *g_dtp;
-#if defined(sun)
static char *g_etcfile = "/etc/system";
static const char *g_etcbegin = "* vvvv Added by DTrace";
static const char *g_etcend = "* ^^^^ Added by DTrace";
@@ -114,7 +108,6 @@
"* chapter of the Solaris Dynamic Tracing Guide for details.",
"*",
NULL };
-#endif
static int
usage(FILE *fp)
@@ -202,10 +195,6 @@
static void
dfatal(const char *fmt, ...)
{
-#if !defined(sun) && defined(NEED_ERRLOC)
- char *p_errfile = NULL;
- int errline = 0;
-#endif
va_list ap;
va_start(ap, fmt);
@@ -223,11 +212,6 @@
(void) fprintf(stderr, "%s\n",
dtrace_errmsg(g_dtp, dtrace_errno(g_dtp)));
}
-#if !defined(sun) && defined(NEED_ERRLOC)
- dt_get_errloc(g_dtp, &p_errfile, &errline);
- if (p_errfile != NULL)
- printf("File '%s', line %d\n", p_errfile, errline);
-#endif
/*
* Close the DTrace handle to ensure that any controlled processes are
@@ -388,7 +372,6 @@
free(buf);
}
-#if defined(sun)
static void
etcsystem_prune(void)
{
@@ -499,7 +482,6 @@
error("added forceload directives to %s\n", g_ofile);
}
-#endif
static void
print_probe_info(const dtrace_probeinfo_t *p)
@@ -629,26 +611,12 @@
p = (uchar_t *)dof;
q = p + dof->dofh_loadsz;
-#if defined(sun)
oprintf("dof-data-%d=0x%x", n, *p++);
while (p < q)
oprintf(",0x%x", *p++);
oprintf(";\n");
-#else
- /*
- * On FreeBSD, the DOF data is handled as a kernel environment (kenv)
- * string. We use two hex characters per DOF byte.
- */
- oprintf("dof-data-%d=%02x", n, *p++);
-
- while (p < q)
- oprintf("%02x", *p++);
-
- oprintf("\n");
-#endif
-
dtrace_dof_destroy(g_dtp, dof);
}
@@ -773,8 +741,6 @@
static void
prochandler(struct ps_prochandle *P, const char *msg, void *arg)
{
-fatal("DOODAD in function %s, file %s, line %d\n",__FUNCTION__,__FILE__,__LINE__);
-#ifdef DOODAD
const psinfo_t *prp = Ppsinfo(P);
int pid = Pstatus(P)->pr_pid;
char name[SIG2STR_MAX];
@@ -812,7 +778,6 @@
g_pslive--;
break;
}
-#endif
}
/*ARGSUSED*/
@@ -1194,10 +1159,9 @@
dtrace_optval_t opt;
dtrace_cmd_t *dcp;
- g_ofp = stdout;
int done = 0, mode = 0;
- int err, i, c;
- char *p, **v;
+ int err, i;
+ char c, *p, **v;
struct ps_prochandle *P;
pid_t pid;
@@ -1224,7 +1188,7 @@
* options into g_argv[], and abort if any invalid options are found.
*/
for (optind = 1; optind < argc; optind++) {
- while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
+ while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
switch (c) {
case '3':
if (strcmp(optarg, "2") != 0) {
@@ -1373,14 +1337,8 @@
dtrace_errmsg(NULL, err));
}
-#if defined(__i386__)
- /* XXX The 32-bit seems to need more buffer space by default -sson */
- (void) dtrace_setopt(g_dtp, "bufsize", "12m");
- (void) dtrace_setopt(g_dtp, "aggsize", "12m");
-#else
(void) dtrace_setopt(g_dtp, "bufsize", "4m");
(void) dtrace_setopt(g_dtp, "aggsize", "4m");
-#endif
/*
* If -G is specified, enable -xlink=dynamic and -xunodefs to permit
@@ -1413,7 +1371,7 @@
* this time; these will compiled as part of the fourth processing pass.
*/
for (optind = 1; optind < argc; optind++) {
- while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
+ while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
switch (c) {
case 'a':
if (dtrace_setopt(g_dtp, "grabanon", 0) != 0)
@@ -1570,7 +1528,7 @@
* may been affected by any library options set by the second pass.
*/
for (optind = 1; optind < argc; optind++) {
- while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
+ while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
switch (c) {
case 'c':
if ((v = make_argv(optarg)) == NULL)
@@ -1658,21 +1616,10 @@
case DMODE_ANON:
if (g_ofile == NULL)
-#if defined(sun)
g_ofile = "/kernel/drv/dtrace.conf";
-#else
- /*
- * On FreeBSD, anonymous DOF data is written to
- * the DTrace DOF file that the boot loader will
- * read if booting with the DTrace option.
- */
- g_ofile = "/boot/dtrace.dof";
-#endif
dof_prune(g_ofile); /* strip out any old DOF directives */
-#if defined(sun)
etcsystem_prune(); /* string out any forceload directives */
-#endif
if (g_cmdc == 0) {
dtrace_close(g_dtp);
@@ -1703,10 +1650,8 @@
* that itself contains a #pragma D option quiet.
*/
error("saved anonymous enabling in %s\n", g_ofile);
-#if defined(sun)
etcsystem_add();
error("run update_drv(1M) or reboot to enable changes\n");
-#endif
dtrace_close(g_dtp);
return (g_status);
@@ -1835,11 +1780,6 @@
if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
(void) sigaction(SIGTERM, &act, NULL);
-#if !defined(sun)
- if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
- (void) sigaction(SIGUSR1, &act, NULL);
-#endif
-
/*
* Now that tracing is active and we are ready to consume trace data,
* continue any grabbed or created processes, setting them running
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#4 (text+ko) ====
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/perl5/bin/perl
#
# CDDL HEADER START
#
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#5 (xtext) ====
@@ -1,4 +1,4 @@
-#!/usr/local/bin/perl
+#!/usr/perl5/bin/perl
#
# CDDL HEADER START
#
@@ -43,7 +43,7 @@
@dtrace_argv = ();
-$ksh_path = '/bin/sh';
+$ksh_path = '/usr/bin/ksh';
@files = ();
%exceptions = ();
@@ -273,7 +273,7 @@
}
$fullname = "$dir/$name";
- $exe = "./$base.exe";
+ $exe = "$dir/$base.exe";
$exe_pid = -1;
if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 ||
@@ -592,7 +592,7 @@
# Ensure that $PATH contains a cc(1) so that we can execute the
# test programs that require compilation of C code.
#
-#$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin';
+$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin';
if ($opt_b) {
logmsg("badioctl'ing ... ");
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#4 (text+ko) ====
@@ -40,8 +40,3 @@
x[123] = `kmem_flags;
x[456] = *`rootvp;
}
-
-ERROR
-{
- exit(1);
-}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#4 (text+ko) ====
@@ -40,8 +40,3 @@
self->x[123] = `kmem_flags;
self->x[456] = *`rootvp;
}
-
-ERROR
-{
- exit(1);
-}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#4 (text+ko) ====
@@ -53,8 +53,3 @@
printf("address of process = %u\n", curpsinfo->pr_addr);
exit (0);
}
-
-ERROR
-{
- exit(1);
-}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#4 (text+ko) ====
@@ -49,8 +49,3 @@
printf("address of process = %u\n", curpsinfo->pr_addr);
exit (0);
}
-
-ERROR
-{
- exit(1);
-}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#4 (text+ko) ====
@@ -46,7 +46,7 @@
dtrace=$1
$dtrace -qZm wassup'{printf("Iamkool");}' \
--qm BEGIN'{printf("I am done"); exit(0);}'
+-qm unix'{printf("I am done"); exit(0);}'
status=$?
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#4 (text+ko) ====
@@ -30,9 +30,7 @@
* ASSERTION: Test network byte-ordering routines.
*/
-#if defined(__amd64__) || defined(__i386__)
-#define _LITTLE_ENDIAN
-#endif
+#include <sys/isa_defs.h>
BEGIN
{
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#4 (text+ko) ====
@@ -28,17 +28,17 @@
#pragma D option quiet
-in_addr_t *ip4a;
-in_addr_t *ip4b;
-in_addr_t *ip4c;
-in_addr_t *ip4d;
+ipaddr_t *ip4a;
+ipaddr_t *ip4b;
+ipaddr_t *ip4c;
+ipaddr_t *ip4d;
BEGIN
{
- this->buf4a = alloca(sizeof (in_addr_t));
- this->buf4b = alloca(sizeof (in_addr_t));
- this->buf4c = alloca(sizeof (in_addr_t));
- this->buf4d = alloca(sizeof (in_addr_t));
+ this->buf4a = alloca(sizeof (ipaddr_t));
+ this->buf4b = alloca(sizeof (ipaddr_t));
+ this->buf4c = alloca(sizeof (ipaddr_t));
+ this->buf4d = alloca(sizeof (ipaddr_t));
ip4a = this->buf4a;
ip4b = this->buf4b;
ip4c = this->buf4c;
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#4 (text+ko) ====
@@ -53,35 +53,35 @@
ip6f = this->buf6f;
ip6g = this->buf6g;
- ip6a->__u6_addr.__u6_addr8[0] = 0xfe;
- ip6a->__u6_addr.__u6_addr8[1] = 0x80;
- ip6a->__u6_addr.__u6_addr8[8] = 0x02;
- ip6a->__u6_addr.__u6_addr8[9] = 0x14;
- ip6a->__u6_addr.__u6_addr8[10] = 0x4f;
- ip6a->__u6_addr.__u6_addr8[11] = 0xff;
- ip6a->__u6_addr.__u6_addr8[12] = 0xfe;
- ip6a->__u6_addr.__u6_addr8[13] = 0x0b;
- ip6a->__u6_addr.__u6_addr8[14] = 0x76;
- ip6a->__u6_addr.__u6_addr8[15] = 0xc8;
- ip6b->__u6_addr.__u6_addr8[0] = 0x10;
- ip6b->__u6_addr.__u6_addr8[1] = 0x80;
- ip6b->__u6_addr.__u6_addr8[10] = 0x08;
- ip6b->__u6_addr.__u6_addr8[11] = 0x08;
- ip6b->__u6_addr.__u6_addr8[13] = 0x20;
- ip6b->__u6_addr.__u6_addr8[13] = 0x0c;
- ip6b->__u6_addr.__u6_addr8[14] = 0x41;
- ip6b->__u6_addr.__u6_addr8[15] = 0x7a;
- ip6c->__u6_addr.__u6_addr8[15] = 0x01;
- ip6e->__u6_addr.__u6_addr8[12] = 0x7f;
- ip6e->__u6_addr.__u6_addr8[15] = 0x01;
- ip6f->__u6_addr.__u6_addr8[10] = 0xff;
- ip6f->__u6_addr.__u6_addr8[11] = 0xff;
- ip6f->__u6_addr.__u6_addr8[12] = 0x7f;
- ip6f->__u6_addr.__u6_addr8[15] = 0x01;
- ip6g->__u6_addr.__u6_addr8[10] = 0xff;
- ip6g->__u6_addr.__u6_addr8[11] = 0xfe;
- ip6g->__u6_addr.__u6_addr8[12] = 0x7f;
- ip6g->__u6_addr.__u6_addr8[15] = 0x01;
+ ip6a->_S6_un._S6_u8[0] = 0xfe;
+ ip6a->_S6_un._S6_u8[1] = 0x80;
+ ip6a->_S6_un._S6_u8[8] = 0x02;
+ ip6a->_S6_un._S6_u8[9] = 0x14;
+ ip6a->_S6_un._S6_u8[10] = 0x4f;
+ ip6a->_S6_un._S6_u8[11] = 0xff;
+ ip6a->_S6_un._S6_u8[12] = 0xfe;
+ ip6a->_S6_un._S6_u8[13] = 0x0b;
+ ip6a->_S6_un._S6_u8[14] = 0x76;
+ ip6a->_S6_un._S6_u8[15] = 0xc8;
+ ip6b->_S6_un._S6_u8[0] = 0x10;
+ ip6b->_S6_un._S6_u8[1] = 0x80;
+ ip6b->_S6_un._S6_u8[10] = 0x08;
+ ip6b->_S6_un._S6_u8[11] = 0x08;
+ ip6b->_S6_un._S6_u8[13] = 0x20;
+ ip6b->_S6_un._S6_u8[13] = 0x0c;
+ ip6b->_S6_un._S6_u8[14] = 0x41;
+ ip6b->_S6_un._S6_u8[15] = 0x7a;
+ ip6c->_S6_un._S6_u8[15] = 0x01;
+ ip6e->_S6_un._S6_u8[12] = 0x7f;
+ ip6e->_S6_un._S6_u8[15] = 0x01;
+ ip6f->_S6_un._S6_u8[10] = 0xff;
+ ip6f->_S6_un._S6_u8[11] = 0xff;
+ ip6f->_S6_un._S6_u8[12] = 0x7f;
+ ip6f->_S6_un._S6_u8[15] = 0x01;
+ ip6g->_S6_un._S6_u8[10] = 0xff;
+ ip6g->_S6_un._S6_u8[11] = 0xfe;
+ ip6g->_S6_un._S6_u8[12] = 0x7f;
+ ip6g->_S6_un._S6_u8[15] = 0x01;
printf("%s\n", inet_ntoa6(ip6a));
printf("%s\n", inet_ntoa6(ip6b));
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#4 (text+ko) ====
@@ -28,13 +28,10 @@
#pragma D option quiet
-inline int AF_INET = 2;
-inline int AF_INET6 = 28;
-
-in_addr_t *ip4a;
-in_addr_t *ip4b;
-in_addr_t *ip4c;
-in_addr_t *ip4d;
+ipaddr_t *ip4a;
+ipaddr_t *ip4b;
+ipaddr_t *ip4c;
+ipaddr_t *ip4d;
struct in6_addr *ip6a;
struct in6_addr *ip6b;
struct in6_addr *ip6c;
@@ -46,10 +43,10 @@
BEGIN
{
- this->buf4a = alloca(sizeof (in_addr_t));
- this->buf4b = alloca(sizeof (in_addr_t));
- this->buf4c = alloca(sizeof (in_addr_t));
- this->buf4d = alloca(sizeof (in_addr_t));
+ this->buf4a = alloca(sizeof (ipaddr_t));
+ this->buf4b = alloca(sizeof (ipaddr_t));
+ this->buf4c = alloca(sizeof (ipaddr_t));
+ this->buf4d = alloca(sizeof (ipaddr_t));
this->buf6a = alloca(sizeof (struct in6_addr));
this->buf6b = alloca(sizeof (struct in6_addr));
this->buf6c = alloca(sizeof (struct in6_addr));
@@ -75,51 +72,51 @@
*ip4b = htonl(0x7f000001);
*ip4c = htonl(0xffffffff);
*ip4d = htonl(0x00000000);
- ip6a->__u6_addr.__u6_addr8[0] = 0xfe;
- ip6a->__u6_addr.__u6_addr8[1] = 0x80;
- ip6a->__u6_addr.__u6_addr8[8] = 0x02;
- ip6a->__u6_addr.__u6_addr8[9] = 0x14;
- ip6a->__u6_addr.__u6_addr8[10] = 0x4f;
- ip6a->__u6_addr.__u6_addr8[11] = 0xff;
- ip6a->__u6_addr.__u6_addr8[12] = 0xfe;
- ip6a->__u6_addr.__u6_addr8[13] = 0x0b;
- ip6a->__u6_addr.__u6_addr8[14] = 0x76;
- ip6a->__u6_addr.__u6_addr8[15] = 0xc8;
- ip6b->__u6_addr.__u6_addr8[0] = 0x10;
- ip6b->__u6_addr.__u6_addr8[1] = 0x80;
- ip6b->__u6_addr.__u6_addr8[10] = 0x08;
- ip6b->__u6_addr.__u6_addr8[11] = 0x08;
- ip6b->__u6_addr.__u6_addr8[13] = 0x20;
- ip6b->__u6_addr.__u6_addr8[13] = 0x0c;
- ip6b->__u6_addr.__u6_addr8[14] = 0x41;
- ip6b->__u6_addr.__u6_addr8[15] = 0x7a;
- ip6c->__u6_addr.__u6_addr8[15] = 0x01;
- ip6e->__u6_addr.__u6_addr8[12] = 0x7f;
- ip6e->__u6_addr.__u6_addr8[15] = 0x01;
- ip6f->__u6_addr.__u6_addr8[10] = 0xff;
- ip6f->__u6_addr.__u6_addr8[11] = 0xff;
- ip6f->__u6_addr.__u6_addr8[12] = 0x7f;
- ip6f->__u6_addr.__u6_addr8[15] = 0x01;
- ip6g->__u6_addr.__u6_addr8[10] = 0xff;
- ip6g->__u6_addr.__u6_addr8[11] = 0xfe;
- ip6g->__u6_addr.__u6_addr8[12] = 0x7f;
- ip6g->__u6_addr.__u6_addr8[15] = 0x01;
- ip6h->__u6_addr.__u6_addr8[0] = 0xff;
- ip6h->__u6_addr.__u6_addr8[1] = 0xff;
- ip6h->__u6_addr.__u6_addr8[2] = 0xff;
- ip6h->__u6_addr.__u6_addr8[3] = 0xff;
- ip6h->__u6_addr.__u6_addr8[4] = 0xff;
- ip6h->__u6_addr.__u6_addr8[5] = 0xff;
- ip6h->__u6_addr.__u6_addr8[6] = 0xff;
- ip6h->__u6_addr.__u6_addr8[7] = 0xff;
- ip6h->__u6_addr.__u6_addr8[8] = 0xff;
- ip6h->__u6_addr.__u6_addr8[9] = 0xff;
- ip6h->__u6_addr.__u6_addr8[10] = 0xff;
- ip6h->__u6_addr.__u6_addr8[11] = 0xff;
- ip6h->__u6_addr.__u6_addr8[12] = 0xff;
- ip6h->__u6_addr.__u6_addr8[13] = 0xff;
- ip6h->__u6_addr.__u6_addr8[14] = 0xff;
- ip6h->__u6_addr.__u6_addr8[15] = 0xff;
+ ip6a->_S6_un._S6_u8[0] = 0xfe;
+ ip6a->_S6_un._S6_u8[1] = 0x80;
+ ip6a->_S6_un._S6_u8[8] = 0x02;
+ ip6a->_S6_un._S6_u8[9] = 0x14;
+ ip6a->_S6_un._S6_u8[10] = 0x4f;
+ ip6a->_S6_un._S6_u8[11] = 0xff;
+ ip6a->_S6_un._S6_u8[12] = 0xfe;
+ ip6a->_S6_un._S6_u8[13] = 0x0b;
+ ip6a->_S6_un._S6_u8[14] = 0x76;
+ ip6a->_S6_un._S6_u8[15] = 0xc8;
+ ip6b->_S6_un._S6_u8[0] = 0x10;
+ ip6b->_S6_un._S6_u8[1] = 0x80;
+ ip6b->_S6_un._S6_u8[10] = 0x08;
+ ip6b->_S6_un._S6_u8[11] = 0x08;
+ ip6b->_S6_un._S6_u8[13] = 0x20;
+ ip6b->_S6_un._S6_u8[13] = 0x0c;
+ ip6b->_S6_un._S6_u8[14] = 0x41;
+ ip6b->_S6_un._S6_u8[15] = 0x7a;
+ ip6c->_S6_un._S6_u8[15] = 0x01;
+ ip6e->_S6_un._S6_u8[12] = 0x7f;
+ ip6e->_S6_un._S6_u8[15] = 0x01;
+ ip6f->_S6_un._S6_u8[10] = 0xff;
+ ip6f->_S6_un._S6_u8[11] = 0xff;
+ ip6f->_S6_un._S6_u8[12] = 0x7f;
+ ip6f->_S6_un._S6_u8[15] = 0x01;
+ ip6g->_S6_un._S6_u8[10] = 0xff;
+ ip6g->_S6_un._S6_u8[11] = 0xfe;
+ ip6g->_S6_un._S6_u8[12] = 0x7f;
+ ip6g->_S6_un._S6_u8[15] = 0x01;
+ ip6h->_S6_un._S6_u8[0] = 0xff;
+ ip6h->_S6_un._S6_u8[1] = 0xff;
+ ip6h->_S6_un._S6_u8[2] = 0xff;
+ ip6h->_S6_un._S6_u8[3] = 0xff;
+ ip6h->_S6_un._S6_u8[4] = 0xff;
+ ip6h->_S6_un._S6_u8[5] = 0xff;
+ ip6h->_S6_un._S6_u8[6] = 0xff;
+ ip6h->_S6_un._S6_u8[7] = 0xff;
+ ip6h->_S6_un._S6_u8[8] = 0xff;
+ ip6h->_S6_un._S6_u8[9] = 0xff;
+ ip6h->_S6_un._S6_u8[10] = 0xff;
+ ip6h->_S6_un._S6_u8[11] = 0xff;
+ ip6h->_S6_un._S6_u8[12] = 0xff;
+ ip6h->_S6_un._S6_u8[13] = 0xff;
+ ip6h->_S6_un._S6_u8[14] = 0xff;
+ ip6h->_S6_un._S6_u8[15] = 0xff;
printf("%s\n", inet_ntop(AF_INET, ip4a));
printf("%s\n", inet_ntop(AF_INET, ip4b));
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#4 (text+ko) ====
@@ -38,8 +38,8 @@
lockstat:::adaptive-acquire
{
- this->owned = mutex_owned((struct mtx *)arg0);
- this->owner = mutex_owner((struct mtx *)arg0);
+ this->owned = mutex_owned((kmutex_t *)arg0);
+ this->owner = mutex_owner((kmutex_t *)arg0);
}
lockstat:::adaptive-acquire
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#4 (text+ko) ====
@@ -41,17 +41,17 @@
#pragma D option quiet
-struct thread *ptr;
+kthread_t *ptr;
BEGIN
{
i = 0;
}
-lockstat::mtx_lock:adaptive-acquire
+lockstat:genunix:mutex_enter:adaptive-acquire
{
- ptr = mutex_owner((struct mtx *)arg0);
+ ptr = mutex_owner((kmutex_t *)arg0);
i++;
}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#4 (text+ko) ====
@@ -44,9 +44,9 @@
ret = -99;
}
-mtx_lock:adaptive-acquire
+mutex_enter:adaptive-acquire
{
- ret = mutex_type_adaptive((struct mtx *)arg0);
+ ret = mutex_type_adaptive((kmutex_t *)arg0);
i++;
}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#4 (text+ko) ====
@@ -20,20 +20,18 @@
*/
/*
- * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
#pragma D option quiet
-#pragma D option strsize=32
struct {
int index;
int length;
int nolen;
- int alt;
} command[int];
int i;
@@ -41,9 +39,6 @@
BEGIN
{
str = "foobarbazbop";
- str2 = "";
- altstr = "CRAIG: Positioned them, I don't ";
- altstr2 = "know... I'm fairly wide guy.";
command[i].index = 3;
command[i].nolen = 1;
@@ -113,18 +108,6 @@
command[i].length = -1;
i++;
- command[i].index = 3;
- command[i].length = -4;
- i++;
-
- command[i].index = 3;
- command[i].length = -20;
- i++;
-
- command[i].index = -10;
- command[i].length = -5;
- i++;
-
command[i].index = 0;
command[i].length = 400;
i++;
@@ -161,16 +144,6 @@
command[i].length = strlen(str) - 1;
i++;
- command[i].index = 100;
- command[i].length = 10;
- command[i].alt = 1;
- i++;
-
- command[i].index = 100;
- command[i].nolen = 1;
- command[i].alt = 1;
- i++;
-
end = i;
i = 0;
printf("#!/usr/perl5/bin/perl\n\nBEGIN {\n");
@@ -180,21 +153,17 @@
tick-1ms
/i < end && command[i].nolen/
{
- this->str = command[i].alt ? altstr : str;
- this->str2 = command[i].alt ? altstr2 : str2;
- this->result = substr(command[i].alt ?
- "CRAIG: Positioned them, I don't know... I'm fairly wide guy." :
- str, command[i].index);
+ this->result = substr(str, command[i].index);
- printf("\tif (substr(\"%s%s\", %d) ne \"%s\") {\n",
- this->str, this->str2, command[i].index, this->result);
+ printf("\tif (substr(\"%s\", %d) != \"%s\") {\n",
+ str, command[i].index, this->result);
- printf("\t\tprintf(\"perl => substr(\\\"%s%s\\\", %d) = ",
- this->str, this->str2, command[i].index);
- printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s%s\", %d));\n",
- this->str, this->str2, command[i].index);
- printf("\t\tprintf(\" D => substr(\\\"%s%s\\\", %d) = ",
- this->str, this->str2, command[i].index);
+ printf("\t\tprintf(\"perl => substr(\\\"%s\\\", %d) = ",
+ str, command[i].index);
+ printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s\", %d));\n",
+ str, command[i].index);
+ printf("\t\tprintf(\" D => substr(\\\"%s\\\", %d) = ",
+ str, command[i].index);
printf("\\\"%%s\\\"\\n\",\n\t\t \"%s\");\n", this->result);
printf("\t\t$failed++;\n");
printf("\t}\n\n");
@@ -203,21 +172,16 @@
tick-1ms
/i < end && !command[i].nolen/
{
- this->str = command[i].alt ? altstr : str;
- this->str2 = command[i].alt ? altstr2 : str2;
- this->result = substr(command[i].alt ?
- "CRAIG: Positioned them, I don't know... I'm fairly wide guy." :
+ this->result = substr(str, command[i].index, command[i].length);
+
+ printf("\tif (substr(\"%s\", %d, %d) != \"%s\") {\n",
+ str, command[i].index, command[i].length, this->result);
+ printf("\t\tprintf(\"perl => substr(\\\"%s\\\", %d, %d) = ",
+ str, command[i].index, command[i].length);
+ printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s\", %d, %d));\n",
+ str, command[i].index, command[i].length);
+ printf("\t\tprintf(\" D => substr(\\\"%s\\\", %d, %d) = ",
str, command[i].index, command[i].length);
-
- printf("\tif (substr(\"%s%s\", %d, %d) ne \"%s\") {\n",
- this->str, this->str2, command[i].index, command[i].length,
- this->result);
- printf("\t\tprintf(\"perl => substr(\\\"%s%s\\\", %d, %d) = ",
- this->str, this->str2, command[i].index, command[i].length);
- printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s%s\", %d, %d));\n",
- this->str, this->str2, command[i].index, command[i].length);
- printf("\t\tprintf(\" D => substr(\\\"%s%s\\\", %d, %d) = ",
- this->str, this->str2, command[i].index, command[i].length);
printf("\\\"%%s\\\"\\n\",\n\t\t \"%s\");\n", this->result);
printf("\t\t$failed++;\n");
printf("\t}\n\n");
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#4 (text+ko) ====
@@ -1,7 +1,7 @@
#!/usr/perl5/bin/perl
BEGIN {
- if (substr("foobarbazbop", 3) ne "barbazbop") {
+ if (substr("foobarbazbop", 3) != "barbazbop") {
printf("perl => substr(\"foobarbazbop\", 3) = \"%s\"\n",
substr("foobarbazbop", 3));
printf(" D => substr(\"foobarbazbop\", 3) = \"%s\"\n",
@@ -9,7 +9,7 @@
$failed++;
}
- if (substr("foobarbazbop", 300) ne "") {
+ if (substr("foobarbazbop", 300) != "") {
printf("perl => substr(\"foobarbazbop\", 300) = \"%s\"\n",
substr("foobarbazbop", 300));
printf(" D => substr(\"foobarbazbop\", 300) = \"%s\"\n",
@@ -17,7 +17,7 @@
$failed++;
}
- if (substr("foobarbazbop", -10) ne "obarbazbop") {
+ if (substr("foobarbazbop", -10) != "obarbazbop") {
printf("perl => substr(\"foobarbazbop\", -10) = \"%s\"\n",
substr("foobarbazbop", -10));
printf(" D => substr(\"foobarbazbop\", -10) = \"%s\"\n",
@@ -25,7 +25,7 @@
$failed++;
}
- if (substr("foobarbazbop", 0) ne "foobarbazbop") {
+ if (substr("foobarbazbop", 0) != "foobarbazbop") {
printf("perl => substr(\"foobarbazbop\", 0) = \"%s\"\n",
substr("foobarbazbop", 0));
printf(" D => substr(\"foobarbazbop\", 0) = \"%s\"\n",
@@ -33,7 +33,7 @@
$failed++;
}
- if (substr("foobarbazbop", 1) ne "oobarbazbop") {
+ if (substr("foobarbazbop", 1) != "oobarbazbop") {
printf("perl => substr(\"foobarbazbop\", 1) = \"%s\"\n",
substr("foobarbazbop", 1));
printf(" D => substr(\"foobarbazbop\", 1) = \"%s\"\n",
@@ -41,7 +41,7 @@
$failed++;
}
- if (substr("foobarbazbop", 11) ne "p") {
+ if (substr("foobarbazbop", 11) != "p") {
printf("perl => substr(\"foobarbazbop\", 11) = \"%s\"\n",
substr("foobarbazbop", 11));
printf(" D => substr(\"foobarbazbop\", 11) = \"%s\"\n",
@@ -49,7 +49,7 @@
$failed++;
}
- if (substr("foobarbazbop", 12) ne "") {
+ if (substr("foobarbazbop", 12) != "") {
printf("perl => substr(\"foobarbazbop\", 12) = \"%s\"\n",
substr("foobarbazbop", 12));
printf(" D => substr(\"foobarbazbop\", 12) = \"%s\"\n",
@@ -57,7 +57,7 @@
$failed++;
}
- if (substr("foobarbazbop", 13) ne "") {
+ if (substr("foobarbazbop", 13) != "") {
printf("perl => substr(\"foobarbazbop\", 13) = \"%s\"\n",
substr("foobarbazbop", 13));
printf(" D => substr(\"foobarbazbop\", 13) = \"%s\"\n",
@@ -65,7 +65,7 @@
$failed++;
}
- if (substr("foobarbazbop", 8, 20) ne "zbop") {
+ if (substr("foobarbazbop", 8, 20) != "zbop") {
printf("perl => substr(\"foobarbazbop\", 8, 20) = \"%s\"\n",
substr("foobarbazbop", 8, 20));
printf(" D => substr(\"foobarbazbop\", 8, 20) = \"%s\"\n",
@@ -73,7 +73,7 @@
$failed++;
}
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 05:45:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C7BFB1065670; Sat, 26 Apr 2008 05:45:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 89808106566B
for <perforce@freebsd.org>; Sat, 26 Apr 2008 05:45:12 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 7B22A8FC0C
for <perforce@freebsd.org>; Sat, 26 Apr 2008 05:45:12 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3Q5jCaf021439
for <perforce@freebsd.org>; Sat, 26 Apr 2008 05:45:12 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3Q5jCeo021433
for perforce@freebsd.org; Sat, 26 Apr 2008 05:45:12 GMT
(envelope-from jb@freebsd.org)
Date: Sat, 26 Apr 2008 05:45:12 GMT
Message-Id: <200804260545.m3Q5jCeo021433@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140658 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 05:45:13 -0000
http://perforce.freebsd.org/chv.cgi?CH=140658
Change 140658 by jb@freebsd3 on 2008/04/26 05:44:27
IFC
Affected files ...
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#6 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.create.ksh#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exec.ksh#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ENOENT.ksh#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.execfail.ksh#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitcore.ksh#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.exitexit.ksh#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/proc/tst.sigwait.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise1.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise2.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/raise/tst.raise3.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/safety/tst.rw.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/trace/tst.misc.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/tracemem/tst.rootvp.d#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/mdb/tools/common/die.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/mdb/tools/common/util.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/alist.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/debug.h#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/include/sgs.h#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/sgs/tools/common/findprime.c#4 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_lib.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libctf/common/ctf_subr.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_aggregate.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_lex.l#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_program.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_provider.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_subr.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_work.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dtrace.h#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mkerrtags.sh#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/mknames.sh#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libgen/common/gmatch.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/list.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/common/memory.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/alist.h#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/barrier.h#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctf.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfconvert.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctfmerge.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/ctftools.h#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/dwarf.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/fixup_tdescs.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/hash.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/iidesc.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/input.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/merge.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/output.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/st_parse.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/stabs.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/strtab.h#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/tdata.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/traverse.h#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/cvt/util.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/tools/ctf/dump/dump.c#5 integrate
Differences ...
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/dtrace.c#5 (text) ====
@@ -34,15 +34,20 @@
#include <stdlib.h>
#include <stdarg.h>
#include <stdio.h>
+#include <string.h>
#include <strings.h>
#include <unistd.h>
#include <limits.h>
#include <fcntl.h>
#include <errno.h>
#include <signal.h>
+#if defined(sun)
#include <alloca.h>
+#endif
#include <libgen.h>
+#if defined(sun)
#include <libproc.h>
+#endif
typedef struct dtrace_cmd {
void (*dc_func)(struct dtrace_cmd *); /* function to compile arg */
@@ -92,8 +97,9 @@
static int g_status = E_SUCCESS;
static int g_grabanon = 0;
static const char *g_ofile = NULL;
-static FILE *g_ofp = stdout;
+static FILE *g_ofp;
static dtrace_hdl_t *g_dtp;
+#if defined(sun)
static char *g_etcfile = "/etc/system";
static const char *g_etcbegin = "* vvvv Added by DTrace";
static const char *g_etcend = "* ^^^^ Added by DTrace";
@@ -108,6 +114,7 @@
"* chapter of the Solaris Dynamic Tracing Guide for details.",
"*",
NULL };
+#endif
static int
usage(FILE *fp)
@@ -195,6 +202,10 @@
static void
dfatal(const char *fmt, ...)
{
+#if !defined(sun) && defined(NEED_ERRLOC)
+ char *p_errfile = NULL;
+ int errline = 0;
+#endif
va_list ap;
va_start(ap, fmt);
@@ -212,6 +223,11 @@
(void) fprintf(stderr, "%s\n",
dtrace_errmsg(g_dtp, dtrace_errno(g_dtp)));
}
+#if !defined(sun) && defined(NEED_ERRLOC)
+ dt_get_errloc(g_dtp, &p_errfile, &errline);
+ if (p_errfile != NULL)
+ printf("File '%s', line %d\n", p_errfile, errline);
+#endif
/*
* Close the DTrace handle to ensure that any controlled processes are
@@ -372,6 +388,7 @@
free(buf);
}
+#if defined(sun)
static void
etcsystem_prune(void)
{
@@ -482,6 +499,7 @@
error("added forceload directives to %s\n", g_ofile);
}
+#endif
static void
print_probe_info(const dtrace_probeinfo_t *p)
@@ -611,12 +629,26 @@
p = (uchar_t *)dof;
q = p + dof->dofh_loadsz;
+#if defined(sun)
oprintf("dof-data-%d=0x%x", n, *p++);
while (p < q)
oprintf(",0x%x", *p++);
oprintf(";\n");
+#else
+ /*
+ * On FreeBSD, the DOF data is handled as a kernel environment (kenv)
+ * string. We use two hex characters per DOF byte.
+ */
+ oprintf("dof-data-%d=%02x", n, *p++);
+
+ while (p < q)
+ oprintf("%02x", *p++);
+
+ oprintf("\n");
+#endif
+
dtrace_dof_destroy(g_dtp, dof);
}
@@ -741,6 +773,8 @@
static void
prochandler(struct ps_prochandle *P, const char *msg, void *arg)
{
+fatal("DOODAD in function %s, file %s, line %d\n",__FUNCTION__,__FILE__,__LINE__);
+#ifdef DOODAD
const psinfo_t *prp = Ppsinfo(P);
int pid = Pstatus(P)->pr_pid;
char name[SIG2STR_MAX];
@@ -778,6 +812,7 @@
g_pslive--;
break;
}
+#endif
}
/*ARGSUSED*/
@@ -1159,9 +1194,10 @@
dtrace_optval_t opt;
dtrace_cmd_t *dcp;
+ g_ofp = stdout;
int done = 0, mode = 0;
- int err, i;
- char c, *p, **v;
+ int err, i, c;
+ char *p, **v;
struct ps_prochandle *P;
pid_t pid;
@@ -1188,7 +1224,7 @@
* options into g_argv[], and abort if any invalid options are found.
*/
for (optind = 1; optind < argc; optind++) {
- while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
+ while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
switch (c) {
case '3':
if (strcmp(optarg, "2") != 0) {
@@ -1337,8 +1373,14 @@
dtrace_errmsg(NULL, err));
}
+#if defined(__i386__)
+ /* XXX The 32-bit seems to need more buffer space by default -sson */
+ (void) dtrace_setopt(g_dtp, "bufsize", "12m");
+ (void) dtrace_setopt(g_dtp, "aggsize", "12m");
+#else
(void) dtrace_setopt(g_dtp, "bufsize", "4m");
(void) dtrace_setopt(g_dtp, "aggsize", "4m");
+#endif
/*
* If -G is specified, enable -xlink=dynamic and -xunodefs to permit
@@ -1371,7 +1413,7 @@
* this time; these will compiled as part of the fourth processing pass.
*/
for (optind = 1; optind < argc; optind++) {
- while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
+ while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
switch (c) {
case 'a':
if (dtrace_setopt(g_dtp, "grabanon", 0) != 0)
@@ -1528,7 +1570,7 @@
* may been affected by any library options set by the second pass.
*/
for (optind = 1; optind < argc; optind++) {
- while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != EOF) {
+ while ((c = getopt(argc, argv, DTRACE_OPTSTR)) != -1) {
switch (c) {
case 'c':
if ((v = make_argv(optarg)) == NULL)
@@ -1616,10 +1658,21 @@
case DMODE_ANON:
if (g_ofile == NULL)
+#if defined(sun)
g_ofile = "/kernel/drv/dtrace.conf";
+#else
+ /*
+ * On FreeBSD, anonymous DOF data is written to
+ * the DTrace DOF file that the boot loader will
+ * read if booting with the DTrace option.
+ */
+ g_ofile = "/boot/dtrace.dof";
+#endif
dof_prune(g_ofile); /* strip out any old DOF directives */
+#if defined(sun)
etcsystem_prune(); /* string out any forceload directives */
+#endif
if (g_cmdc == 0) {
dtrace_close(g_dtp);
@@ -1650,8 +1703,10 @@
* that itself contains a #pragma D option quiet.
*/
error("saved anonymous enabling in %s\n", g_ofile);
+#if defined(sun)
etcsystem_add();
error("run update_drv(1M) or reboot to enable changes\n");
+#endif
dtrace_close(g_dtp);
return (g_status);
@@ -1780,6 +1835,11 @@
if (sigaction(SIGTERM, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
(void) sigaction(SIGTERM, &act, NULL);
+#if !defined(sun)
+ if (sigaction(SIGUSR1, NULL, &oact) == 0 && oact.sa_handler != SIG_IGN)
+ (void) sigaction(SIGUSR1, &act, NULL);
+#endif
+
/*
* Now that tracing is active and we are ready to consume trace data,
* continue any grabbed or created processes, setting them running
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dstyle.pl#5 (text+ko) ====
@@ -1,4 +1,4 @@
-#!/usr/perl5/bin/perl
+#!/usr/local/bin/perl
#
# CDDL HEADER START
#
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/cmd/scripts/dtest.pl#6 (xtext) ====
@@ -1,4 +1,4 @@
-#!/usr/perl5/bin/perl
+#!/usr/local/bin/perl
#
# CDDL HEADER START
#
@@ -43,7 +43,7 @@
@dtrace_argv = ();
-$ksh_path = '/usr/bin/ksh';
+$ksh_path = '/bin/sh';
@files = ();
%exceptions = ();
@@ -273,7 +273,7 @@
}
$fullname = "$dir/$name";
- $exe = "$dir/$base.exe";
+ $exe = "./$base.exe";
$exe_pid = -1;
if ($opt_a && ($status != 0 || $tag != 0 || $droptag != 0 ||
@@ -592,7 +592,7 @@
# Ensure that $PATH contains a cc(1) so that we can execute the
# test programs that require compilation of C code.
#
-$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin';
+#$ENV{'PATH'} = $ENV{'PATH'} . ':/ws/onnv-tools/SUNWspro/SS11/bin';
if ($opt_b) {
logmsg("badioctl'ing ... ");
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupgtype.d#5 (text+ko) ====
@@ -40,3 +40,8 @@
x[123] = `kmem_flags;
x[456] = *`rootvp;
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/assocs/err.D_OP_INCOMPAT.dupttype.d#5 (text+ko) ====
@@ -40,3 +40,8 @@
self->x[123] = `kmem_flags;
self->x[456] = *`rootvp;
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo.d#5 (text+ko) ====
@@ -53,3 +53,8 @@
printf("address of process = %u\n", curpsinfo->pr_addr);
exit (0);
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/builtinvar/tst.psinfo1.d#5 (text+ko) ====
@@ -49,3 +49,8 @@
printf("address of process = %u\n", curpsinfo->pr_addr);
exit (0);
}
+
+ERROR
+{
+ exit(1);
+}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/dtraceUtil/tst.ZeroModuleProbes.d.ksh#5 (text+ko) ====
@@ -46,7 +46,7 @@
dtrace=$1
$dtrace -qZm wassup'{printf("Iamkool");}' \
--qm unix'{printf("I am done"); exit(0);}'
+-qm BEGIN'{printf("I am done"); exit(0);}'
status=$?
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.hton.d#5 (text+ko) ====
@@ -30,7 +30,9 @@
* ASSERTION: Test network byte-ordering routines.
*/
-#include <sys/isa_defs.h>
+#if defined(__amd64__) || defined(__i386__)
+#define _LITTLE_ENDIAN
+#endif
BEGIN
{
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa.d#5 (text+ko) ====
@@ -28,17 +28,17 @@
#pragma D option quiet
-ipaddr_t *ip4a;
-ipaddr_t *ip4b;
-ipaddr_t *ip4c;
-ipaddr_t *ip4d;
+in_addr_t *ip4a;
+in_addr_t *ip4b;
+in_addr_t *ip4c;
+in_addr_t *ip4d;
BEGIN
{
- this->buf4a = alloca(sizeof (ipaddr_t));
- this->buf4b = alloca(sizeof (ipaddr_t));
- this->buf4c = alloca(sizeof (ipaddr_t));
- this->buf4d = alloca(sizeof (ipaddr_t));
+ this->buf4a = alloca(sizeof (in_addr_t));
+ this->buf4b = alloca(sizeof (in_addr_t));
+ this->buf4c = alloca(sizeof (in_addr_t));
+ this->buf4d = alloca(sizeof (in_addr_t));
ip4a = this->buf4a;
ip4b = this->buf4b;
ip4c = this->buf4c;
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntoa6.d#5 (text+ko) ====
@@ -53,35 +53,35 @@
ip6f = this->buf6f;
ip6g = this->buf6g;
- ip6a->_S6_un._S6_u8[0] = 0xfe;
- ip6a->_S6_un._S6_u8[1] = 0x80;
- ip6a->_S6_un._S6_u8[8] = 0x02;
- ip6a->_S6_un._S6_u8[9] = 0x14;
- ip6a->_S6_un._S6_u8[10] = 0x4f;
- ip6a->_S6_un._S6_u8[11] = 0xff;
- ip6a->_S6_un._S6_u8[12] = 0xfe;
- ip6a->_S6_un._S6_u8[13] = 0x0b;
- ip6a->_S6_un._S6_u8[14] = 0x76;
- ip6a->_S6_un._S6_u8[15] = 0xc8;
- ip6b->_S6_un._S6_u8[0] = 0x10;
- ip6b->_S6_un._S6_u8[1] = 0x80;
- ip6b->_S6_un._S6_u8[10] = 0x08;
- ip6b->_S6_un._S6_u8[11] = 0x08;
- ip6b->_S6_un._S6_u8[13] = 0x20;
- ip6b->_S6_un._S6_u8[13] = 0x0c;
- ip6b->_S6_un._S6_u8[14] = 0x41;
- ip6b->_S6_un._S6_u8[15] = 0x7a;
- ip6c->_S6_un._S6_u8[15] = 0x01;
- ip6e->_S6_un._S6_u8[12] = 0x7f;
- ip6e->_S6_un._S6_u8[15] = 0x01;
- ip6f->_S6_un._S6_u8[10] = 0xff;
- ip6f->_S6_un._S6_u8[11] = 0xff;
- ip6f->_S6_un._S6_u8[12] = 0x7f;
- ip6f->_S6_un._S6_u8[15] = 0x01;
- ip6g->_S6_un._S6_u8[10] = 0xff;
- ip6g->_S6_un._S6_u8[11] = 0xfe;
- ip6g->_S6_un._S6_u8[12] = 0x7f;
- ip6g->_S6_un._S6_u8[15] = 0x01;
+ ip6a->__u6_addr.__u6_addr8[0] = 0xfe;
+ ip6a->__u6_addr.__u6_addr8[1] = 0x80;
+ ip6a->__u6_addr.__u6_addr8[8] = 0x02;
+ ip6a->__u6_addr.__u6_addr8[9] = 0x14;
+ ip6a->__u6_addr.__u6_addr8[10] = 0x4f;
+ ip6a->__u6_addr.__u6_addr8[11] = 0xff;
+ ip6a->__u6_addr.__u6_addr8[12] = 0xfe;
+ ip6a->__u6_addr.__u6_addr8[13] = 0x0b;
+ ip6a->__u6_addr.__u6_addr8[14] = 0x76;
+ ip6a->__u6_addr.__u6_addr8[15] = 0xc8;
+ ip6b->__u6_addr.__u6_addr8[0] = 0x10;
+ ip6b->__u6_addr.__u6_addr8[1] = 0x80;
+ ip6b->__u6_addr.__u6_addr8[10] = 0x08;
+ ip6b->__u6_addr.__u6_addr8[11] = 0x08;
+ ip6b->__u6_addr.__u6_addr8[13] = 0x20;
+ ip6b->__u6_addr.__u6_addr8[13] = 0x0c;
+ ip6b->__u6_addr.__u6_addr8[14] = 0x41;
+ ip6b->__u6_addr.__u6_addr8[15] = 0x7a;
+ ip6c->__u6_addr.__u6_addr8[15] = 0x01;
+ ip6e->__u6_addr.__u6_addr8[12] = 0x7f;
+ ip6e->__u6_addr.__u6_addr8[15] = 0x01;
+ ip6f->__u6_addr.__u6_addr8[10] = 0xff;
+ ip6f->__u6_addr.__u6_addr8[11] = 0xff;
+ ip6f->__u6_addr.__u6_addr8[12] = 0x7f;
+ ip6f->__u6_addr.__u6_addr8[15] = 0x01;
+ ip6g->__u6_addr.__u6_addr8[10] = 0xff;
+ ip6g->__u6_addr.__u6_addr8[11] = 0xfe;
+ ip6g->__u6_addr.__u6_addr8[12] = 0x7f;
+ ip6g->__u6_addr.__u6_addr8[15] = 0x01;
printf("%s\n", inet_ntoa6(ip6a));
printf("%s\n", inet_ntoa6(ip6b));
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.inet_ntop.d#5 (text+ko) ====
@@ -28,10 +28,13 @@
#pragma D option quiet
-ipaddr_t *ip4a;
-ipaddr_t *ip4b;
-ipaddr_t *ip4c;
-ipaddr_t *ip4d;
+inline int AF_INET = 2;
+inline int AF_INET6 = 28;
+
+in_addr_t *ip4a;
+in_addr_t *ip4b;
+in_addr_t *ip4c;
+in_addr_t *ip4d;
struct in6_addr *ip6a;
struct in6_addr *ip6b;
struct in6_addr *ip6c;
@@ -43,10 +46,10 @@
BEGIN
{
- this->buf4a = alloca(sizeof (ipaddr_t));
- this->buf4b = alloca(sizeof (ipaddr_t));
- this->buf4c = alloca(sizeof (ipaddr_t));
- this->buf4d = alloca(sizeof (ipaddr_t));
+ this->buf4a = alloca(sizeof (in_addr_t));
+ this->buf4b = alloca(sizeof (in_addr_t));
+ this->buf4c = alloca(sizeof (in_addr_t));
+ this->buf4d = alloca(sizeof (in_addr_t));
this->buf6a = alloca(sizeof (struct in6_addr));
this->buf6b = alloca(sizeof (struct in6_addr));
this->buf6c = alloca(sizeof (struct in6_addr));
@@ -72,51 +75,51 @@
*ip4b = htonl(0x7f000001);
*ip4c = htonl(0xffffffff);
*ip4d = htonl(0x00000000);
- ip6a->_S6_un._S6_u8[0] = 0xfe;
- ip6a->_S6_un._S6_u8[1] = 0x80;
- ip6a->_S6_un._S6_u8[8] = 0x02;
- ip6a->_S6_un._S6_u8[9] = 0x14;
- ip6a->_S6_un._S6_u8[10] = 0x4f;
- ip6a->_S6_un._S6_u8[11] = 0xff;
- ip6a->_S6_un._S6_u8[12] = 0xfe;
- ip6a->_S6_un._S6_u8[13] = 0x0b;
- ip6a->_S6_un._S6_u8[14] = 0x76;
- ip6a->_S6_un._S6_u8[15] = 0xc8;
- ip6b->_S6_un._S6_u8[0] = 0x10;
- ip6b->_S6_un._S6_u8[1] = 0x80;
- ip6b->_S6_un._S6_u8[10] = 0x08;
- ip6b->_S6_un._S6_u8[11] = 0x08;
- ip6b->_S6_un._S6_u8[13] = 0x20;
- ip6b->_S6_un._S6_u8[13] = 0x0c;
- ip6b->_S6_un._S6_u8[14] = 0x41;
- ip6b->_S6_un._S6_u8[15] = 0x7a;
- ip6c->_S6_un._S6_u8[15] = 0x01;
- ip6e->_S6_un._S6_u8[12] = 0x7f;
- ip6e->_S6_un._S6_u8[15] = 0x01;
- ip6f->_S6_un._S6_u8[10] = 0xff;
- ip6f->_S6_un._S6_u8[11] = 0xff;
- ip6f->_S6_un._S6_u8[12] = 0x7f;
- ip6f->_S6_un._S6_u8[15] = 0x01;
- ip6g->_S6_un._S6_u8[10] = 0xff;
- ip6g->_S6_un._S6_u8[11] = 0xfe;
- ip6g->_S6_un._S6_u8[12] = 0x7f;
- ip6g->_S6_un._S6_u8[15] = 0x01;
- ip6h->_S6_un._S6_u8[0] = 0xff;
- ip6h->_S6_un._S6_u8[1] = 0xff;
- ip6h->_S6_un._S6_u8[2] = 0xff;
- ip6h->_S6_un._S6_u8[3] = 0xff;
- ip6h->_S6_un._S6_u8[4] = 0xff;
- ip6h->_S6_un._S6_u8[5] = 0xff;
- ip6h->_S6_un._S6_u8[6] = 0xff;
- ip6h->_S6_un._S6_u8[7] = 0xff;
- ip6h->_S6_un._S6_u8[8] = 0xff;
- ip6h->_S6_un._S6_u8[9] = 0xff;
- ip6h->_S6_un._S6_u8[10] = 0xff;
- ip6h->_S6_un._S6_u8[11] = 0xff;
- ip6h->_S6_un._S6_u8[12] = 0xff;
- ip6h->_S6_un._S6_u8[13] = 0xff;
- ip6h->_S6_un._S6_u8[14] = 0xff;
- ip6h->_S6_un._S6_u8[15] = 0xff;
+ ip6a->__u6_addr.__u6_addr8[0] = 0xfe;
+ ip6a->__u6_addr.__u6_addr8[1] = 0x80;
+ ip6a->__u6_addr.__u6_addr8[8] = 0x02;
+ ip6a->__u6_addr.__u6_addr8[9] = 0x14;
+ ip6a->__u6_addr.__u6_addr8[10] = 0x4f;
+ ip6a->__u6_addr.__u6_addr8[11] = 0xff;
+ ip6a->__u6_addr.__u6_addr8[12] = 0xfe;
+ ip6a->__u6_addr.__u6_addr8[13] = 0x0b;
+ ip6a->__u6_addr.__u6_addr8[14] = 0x76;
+ ip6a->__u6_addr.__u6_addr8[15] = 0xc8;
+ ip6b->__u6_addr.__u6_addr8[0] = 0x10;
+ ip6b->__u6_addr.__u6_addr8[1] = 0x80;
+ ip6b->__u6_addr.__u6_addr8[10] = 0x08;
+ ip6b->__u6_addr.__u6_addr8[11] = 0x08;
+ ip6b->__u6_addr.__u6_addr8[13] = 0x20;
+ ip6b->__u6_addr.__u6_addr8[13] = 0x0c;
+ ip6b->__u6_addr.__u6_addr8[14] = 0x41;
+ ip6b->__u6_addr.__u6_addr8[15] = 0x7a;
+ ip6c->__u6_addr.__u6_addr8[15] = 0x01;
+ ip6e->__u6_addr.__u6_addr8[12] = 0x7f;
+ ip6e->__u6_addr.__u6_addr8[15] = 0x01;
+ ip6f->__u6_addr.__u6_addr8[10] = 0xff;
+ ip6f->__u6_addr.__u6_addr8[11] = 0xff;
+ ip6f->__u6_addr.__u6_addr8[12] = 0x7f;
+ ip6f->__u6_addr.__u6_addr8[15] = 0x01;
+ ip6g->__u6_addr.__u6_addr8[10] = 0xff;
+ ip6g->__u6_addr.__u6_addr8[11] = 0xfe;
+ ip6g->__u6_addr.__u6_addr8[12] = 0x7f;
+ ip6g->__u6_addr.__u6_addr8[15] = 0x01;
+ ip6h->__u6_addr.__u6_addr8[0] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[1] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[2] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[3] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[4] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[5] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[6] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[7] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[8] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[9] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[10] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[11] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[12] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[13] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[14] = 0xff;
+ ip6h->__u6_addr.__u6_addr8[15] = 0xff;
printf("%s\n", inet_ntop(AF_INET, ip4a));
printf("%s\n", inet_ntop(AF_INET, ip4b));
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owned.d#5 (text+ko) ====
@@ -38,8 +38,8 @@
lockstat:::adaptive-acquire
{
- this->owned = mutex_owned((kmutex_t *)arg0);
- this->owner = mutex_owner((kmutex_t *)arg0);
+ this->owned = mutex_owned((struct mtx *)arg0);
+ this->owner = mutex_owner((struct mtx *)arg0);
}
lockstat:::adaptive-acquire
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_owner.d#5 (text+ko) ====
@@ -41,17 +41,17 @@
#pragma D option quiet
-kthread_t *ptr;
+struct thread *ptr;
BEGIN
{
i = 0;
}
-lockstat:genunix:mutex_enter:adaptive-acquire
+lockstat::mtx_lock:adaptive-acquire
{
- ptr = mutex_owner((kmutex_t *)arg0);
+ ptr = mutex_owner((struct mtx *)arg0);
i++;
}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.mutex_type_adaptive.d#5 (text+ko) ====
@@ -44,9 +44,9 @@
ret = -99;
}
-mutex_enter:adaptive-acquire
+mtx_lock:adaptive-acquire
{
- ret = mutex_type_adaptive((kmutex_t *)arg0);
+ ret = mutex_type_adaptive((struct mtx *)arg0);
i++;
}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d#5 (text+ko) ====
@@ -20,18 +20,20 @@
*/
/*
- * Copyright 2006 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
#pragma ident "%Z%%M% %I% %E% SMI"
#pragma D option quiet
+#pragma D option strsize=32
struct {
int index;
int length;
int nolen;
+ int alt;
} command[int];
int i;
@@ -39,6 +41,9 @@
BEGIN
{
str = "foobarbazbop";
+ str2 = "";
+ altstr = "CRAIG: Positioned them, I don't ";
+ altstr2 = "know... I'm fairly wide guy.";
command[i].index = 3;
command[i].nolen = 1;
@@ -108,6 +113,18 @@
command[i].length = -1;
i++;
+ command[i].index = 3;
+ command[i].length = -4;
+ i++;
+
+ command[i].index = 3;
+ command[i].length = -20;
+ i++;
+
+ command[i].index = -10;
+ command[i].length = -5;
+ i++;
+
command[i].index = 0;
command[i].length = 400;
i++;
@@ -144,6 +161,16 @@
command[i].length = strlen(str) - 1;
i++;
+ command[i].index = 100;
+ command[i].length = 10;
+ command[i].alt = 1;
+ i++;
+
+ command[i].index = 100;
+ command[i].nolen = 1;
+ command[i].alt = 1;
+ i++;
+
end = i;
i = 0;
printf("#!/usr/perl5/bin/perl\n\nBEGIN {\n");
@@ -153,17 +180,21 @@
tick-1ms
/i < end && command[i].nolen/
{
- this->result = substr(str, command[i].index);
+ this->str = command[i].alt ? altstr : str;
+ this->str2 = command[i].alt ? altstr2 : str2;
+ this->result = substr(command[i].alt ?
+ "CRAIG: Positioned them, I don't know... I'm fairly wide guy." :
+ str, command[i].index);
- printf("\tif (substr(\"%s\", %d) != \"%s\") {\n",
- str, command[i].index, this->result);
+ printf("\tif (substr(\"%s%s\", %d) ne \"%s\") {\n",
+ this->str, this->str2, command[i].index, this->result);
- printf("\t\tprintf(\"perl => substr(\\\"%s\\\", %d) = ",
- str, command[i].index);
- printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s\", %d));\n",
- str, command[i].index);
- printf("\t\tprintf(\" D => substr(\\\"%s\\\", %d) = ",
- str, command[i].index);
+ printf("\t\tprintf(\"perl => substr(\\\"%s%s\\\", %d) = ",
+ this->str, this->str2, command[i].index);
+ printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s%s\", %d));\n",
+ this->str, this->str2, command[i].index);
+ printf("\t\tprintf(\" D => substr(\\\"%s%s\\\", %d) = ",
+ this->str, this->str2, command[i].index);
printf("\\\"%%s\\\"\\n\",\n\t\t \"%s\");\n", this->result);
printf("\t\t$failed++;\n");
printf("\t}\n\n");
@@ -172,16 +203,21 @@
tick-1ms
/i < end && !command[i].nolen/
{
- this->result = substr(str, command[i].index, command[i].length);
+ this->str = command[i].alt ? altstr : str;
+ this->str2 = command[i].alt ? altstr2 : str2;
+ this->result = substr(command[i].alt ?
+ "CRAIG: Positioned them, I don't know... I'm fairly wide guy." :
+ str, command[i].index, command[i].length);
- printf("\tif (substr(\"%s\", %d, %d) != \"%s\") {\n",
- str, command[i].index, command[i].length, this->result);
- printf("\t\tprintf(\"perl => substr(\\\"%s\\\", %d, %d) = ",
- str, command[i].index, command[i].length);
- printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s\", %d, %d));\n",
- str, command[i].index, command[i].length);
- printf("\t\tprintf(\" D => substr(\\\"%s\\\", %d, %d) = ",
- str, command[i].index, command[i].length);
+ printf("\tif (substr(\"%s%s\", %d, %d) ne \"%s\") {\n",
+ this->str, this->str2, command[i].index, command[i].length,
+ this->result);
+ printf("\t\tprintf(\"perl => substr(\\\"%s%s\\\", %d, %d) = ",
+ this->str, this->str2, command[i].index, command[i].length);
+ printf("\\\"%%s\\\"\\n\",\n\t\t substr(\"%s%s\", %d, %d));\n",
+ this->str, this->str2, command[i].index, command[i].length);
+ printf("\t\tprintf(\" D => substr(\\\"%s%s\\\", %d, %d) = ",
+ this->str, this->str2, command[i].index, command[i].length);
printf("\\\"%%s\\\"\\n\",\n\t\t \"%s\");\n", this->result);
printf("\t\t$failed++;\n");
printf("\t}\n\n");
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/cmd/dtrace/test/tst/common/funcs/tst.substr.d.out#5 (text+ko) ====
@@ -1,7 +1,7 @@
#!/usr/perl5/bin/perl
BEGIN {
- if (substr("foobarbazbop", 3) != "barbazbop") {
+ if (substr("foobarbazbop", 3) ne "barbazbop") {
printf("perl => substr(\"foobarbazbop\", 3) = \"%s\"\n",
substr("foobarbazbop", 3));
printf(" D => substr(\"foobarbazbop\", 3) = \"%s\"\n",
@@ -9,7 +9,7 @@
$failed++;
}
- if (substr("foobarbazbop", 300) != "") {
+ if (substr("foobarbazbop", 300) ne "") {
printf("perl => substr(\"foobarbazbop\", 300) = \"%s\"\n",
substr("foobarbazbop", 300));
printf(" D => substr(\"foobarbazbop\", 300) = \"%s\"\n",
@@ -17,7 +17,7 @@
$failed++;
}
- if (substr("foobarbazbop", -10) != "obarbazbop") {
+ if (substr("foobarbazbop", -10) ne "obarbazbop") {
printf("perl => substr(\"foobarbazbop\", -10) = \"%s\"\n",
substr("foobarbazbop", -10));
printf(" D => substr(\"foobarbazbop\", -10) = \"%s\"\n",
@@ -25,7 +25,7 @@
$failed++;
}
- if (substr("foobarbazbop", 0) != "foobarbazbop") {
+ if (substr("foobarbazbop", 0) ne "foobarbazbop") {
printf("perl => substr(\"foobarbazbop\", 0) = \"%s\"\n",
substr("foobarbazbop", 0));
printf(" D => substr(\"foobarbazbop\", 0) = \"%s\"\n",
@@ -33,7 +33,7 @@
$failed++;
}
- if (substr("foobarbazbop", 1) != "oobarbazbop") {
+ if (substr("foobarbazbop", 1) ne "oobarbazbop") {
printf("perl => substr(\"foobarbazbop\", 1) = \"%s\"\n",
substr("foobarbazbop", 1));
printf(" D => substr(\"foobarbazbop\", 1) = \"%s\"\n",
@@ -41,7 +41,7 @@
$failed++;
}
- if (substr("foobarbazbop", 11) != "p") {
+ if (substr("foobarbazbop", 11) ne "p") {
printf("perl => substr(\"foobarbazbop\", 11) = \"%s\"\n",
substr("foobarbazbop", 11));
printf(" D => substr(\"foobarbazbop\", 11) = \"%s\"\n",
@@ -49,7 +49,7 @@
$failed++;
}
- if (substr("foobarbazbop", 12) != "") {
+ if (substr("foobarbazbop", 12) ne "") {
printf("perl => substr(\"foobarbazbop\", 12) = \"%s\"\n",
substr("foobarbazbop", 12));
printf(" D => substr(\"foobarbazbop\", 12) = \"%s\"\n",
@@ -57,7 +57,7 @@
$failed++;
}
- if (substr("foobarbazbop", 13) != "") {
+ if (substr("foobarbazbop", 13) ne "") {
printf("perl => substr(\"foobarbazbop\", 13) = \"%s\"\n",
substr("foobarbazbop", 13));
printf(" D => substr(\"foobarbazbop\", 13) = \"%s\"\n",
@@ -65,7 +65,7 @@
$failed++;
}
- if (substr("foobarbazbop", 8, 20) != "zbop") {
+ if (substr("foobarbazbop", 8, 20) ne "zbop") {
printf("perl => substr(\"foobarbazbop\", 8, 20) = \"%s\"\n",
substr("foobarbazbop", 8, 20));
printf(" D => substr(\"foobarbazbop\", 8, 20) = \"%s\"\n",
@@ -73,7 +73,7 @@
$failed++;
}
- if (substr("foobarbazbop", 4, 4) != "arba") {
+ if (substr("foobarbazbop", 4, 4) ne "arba") {
printf("perl => substr(\"foobarbazbop\", 4, 4) = \"%s\"\n",
substr("foobarbazbop", 4, 4));
printf(" D => substr(\"foobarbazbop\", 4, 4) = \"%s\"\n",
@@ -81,7 +81,7 @@
$failed++;
}
- if (substr("foobarbazbop", 5, 8) != "rbazbop") {
+ if (substr("foobarbazbop", 5, 8) ne "rbazbop") {
printf("perl => substr(\"foobarbazbop\", 5, 8) = \"%s\"\n",
substr("foobarbazbop", 5, 8));
printf(" D => substr(\"foobarbazbop\", 5, 8) = \"%s\"\n",
@@ -89,7 +89,7 @@
$failed++;
}
- if (substr("foobarbazbop", 5, 9) != "rbazbop") {
+ if (substr("foobarbazbop", 5, 9) ne "rbazbop") {
printf("perl => substr(\"foobarbazbop\", 5, 9) = \"%s\"\n",
substr("foobarbazbop", 5, 9));
printf(" D => substr(\"foobarbazbop\", 5, 9) = \"%s\"\n",
@@ -97,7 +97,7 @@
$failed++;
}
- if (substr("foobarbazbop", 400, 20) != "") {
+ if (substr("foobarbazbop", 400, 20) ne "") {
printf("perl => substr(\"foobarbazbop\", 400, 20) = \"%s\"\n",
substr("foobarbazbop", 400, 20));
printf(" D => substr(\"foobarbazbop\", 400, 20) = \"%s\"\n",
@@ -105,7 +105,7 @@
$failed++;
}
- if (substr("foobarbazbop", 400, 0) != "") {
+ if (substr("foobarbazbop", 400, 0) ne "") {
printf("perl => substr(\"foobarbazbop\", 400, 0) = \"%s\"\n",
substr("foobarbazbop", 400, 0));
printf(" D => substr(\"foobarbazbop\", 400, 0) = \"%s\"\n",
@@ -113,7 +113,7 @@
$failed++;
}
- if (substr("foobarbazbop", 400, -1) != "") {
+ if (substr("foobarbazbop", 400, -1) ne "") {
printf("perl => substr(\"foobarbazbop\", 400, -1) = \"%s\"\n",
substr("foobarbazbop", 400, -1));
printf(" D => substr(\"foobarbazbop\", 400, -1) = \"%s\"\n",
@@ -121,7 +121,7 @@
$failed++;
}
- if (substr("foobarbazbop", 3, 0) != "") {
+ if (substr("foobarbazbop", 3, 0) ne "") {
printf("perl => substr(\"foobarbazbop\", 3, 0) = \"%s\"\n",
substr("foobarbazbop", 3, 0));
printf(" D => substr(\"foobarbazbop\", 3, 0) = \"%s\"\n",
@@ -129,15 +129,39 @@
$failed++;
}
- if (substr("foobarbazbop", 3, -1) != "") {
+ if (substr("foobarbazbop", 3, -1) ne "barbazbo") {
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 06:45:18 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 9638D1065678; Sat, 26 Apr 2008 06:45:18 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 3FA78106566B
for <perforce@freebsd.org>; Sat, 26 Apr 2008 06:45:18 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 3305A8FC0C
for <perforce@freebsd.org>; Sat, 26 Apr 2008 06:45:18 +0000 (UTC)
(envelope-from jb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3Q6jIUC026301
for <perforce@freebsd.org>; Sat, 26 Apr 2008 06:45:18 GMT
(envelope-from jb@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3Q6jHB3026299
for perforce@freebsd.org; Sat, 26 Apr 2008 06:45:17 GMT
(envelope-from jb@freebsd.org)
Date: Sat, 26 Apr 2008 06:45:17 GMT
Message-Id: <200804260645.m3Q6jHB3026299@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
jb@freebsd.org using -f
From: John Birrell <jb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140660 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 06:45:18 -0000
http://perforce.freebsd.org/chv.cgi?CH=140660
Change 140660 by jb@freebsd3 on 2008/04/26 06:44:19
IFC
Affected files ...
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#6 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_errtags.h#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_handle.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_ident.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_impl.h#6 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_link.c#6 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_map.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_module.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_open.c#6 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_options.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_parser.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pid.c#6 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_pragma.c#6 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.c#5 integrate
.. //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_proc.h#5 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/if_udav.c#9 integrate
.. //depot/projects/dtrace/src/sys/dev/usb/usbdevs#31 integrate
.. //depot/projects/dtrace/src/tools/sched/schedgraph.py#10 integrate
Differences ...
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/drti.c#5 (text) ====
@@ -55,7 +55,7 @@
* DTRACE_DOF_INIT_DEVNAME set the path to the helper node
*/
-static const char *devname = "/dev/dtrace/helper";
+static const char *devnamep = "/dev/dtrace/helper";
static const char *olddevname = "/devices/pseudo/dtrace@0:helper";
static const char *modname; /* Name of this load object */
@@ -85,7 +85,12 @@
va_end(ap);
}
+#if defined(sun)
#pragma init(dtrace_dof_init)
+#else
+static void dtrace_dof_init(void) __attribute__ ((constructor));
+#endif
+
static void
dtrace_dof_init(void)
{
@@ -96,8 +101,13 @@
Elf32_Ehdr *elf;
#endif
dof_helper_t dh;
+#if defined(sun)
Link_map *lmp;
Lmid_t lmid;
+#else
+ struct link_map *lmp;
+ u_long lmid = 0;
+#endif
int fd;
const char *p;
@@ -109,10 +119,12 @@
return;
}
+#if defined(sun)
if (dlinfo(RTLD_SELF, RTLD_DI_LMID, &lmid) == -1) {
dprintf(1, "couldn't discover link map ID\n");
return;
}
+#endif
if ((modname = strrchr(lmp->l_name, '/')) == NULL)
modname = lmp->l_name;
@@ -130,7 +142,7 @@
elf = (void *)lmp->l_addr;
dh.dofhp_dof = (uintptr_t)dof;
- dh.dofhp_addr = elf->e_type == ET_DYN ? lmp->l_addr : 0;
+ dh.dofhp_addr = elf->e_type == ET_DYN ? (uintptr_t) lmp->l_addr : 0;
if (lmid == 0) {
(void) snprintf(dh.dofhp_mod, sizeof (dh.dofhp_mod),
@@ -141,10 +153,10 @@
}
if ((p = getenv("DTRACE_DOF_INIT_DEVNAME")) != NULL)
- devname = p;
+ devnamep = p;
- if ((fd = open64(devname, O_RDWR)) < 0) {
- dprintf(1, "failed to open helper device %s", devname);
+ if ((fd = open64(devnamep, O_RDWR)) < 0) {
+ dprintf(1, "failed to open helper device %s", devnamep);
/*
* If the device path wasn't explicitly set, try again with
@@ -153,10 +165,10 @@
if (p != NULL)
return;
- devname = olddevname;
+ devnamep = olddevname;
- if ((fd = open64(devname, O_RDWR)) < 0) {
- dprintf(1, "failed to open helper device %s", devname);
+ if ((fd = open64(devnamep, O_RDWR)) < 0) {
+ dprintf(1, "failed to open helper device %s", devnamep);
return;
}
}
@@ -169,14 +181,19 @@
(void) close(fd);
}
+#if defined(sun)
#pragma fini(dtrace_dof_fini)
+#else
+static void dtrace_dof_fini(void) __attribute__ ((destructor));
+#endif
+
static void
dtrace_dof_fini(void)
{
int fd;
- if ((fd = open64(devname, O_RDWR)) < 0) {
- dprintf(1, "failed to open helper device %s", devname);
+ if ((fd = open64(devnamep, O_RDWR)) < 0) {
+ dprintf(1, "failed to open helper device %s", devnamep);
return;
}
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cc.c#6 (text) ====
@@ -20,7 +20,7 @@
*/
/*
- * Copyright 2007 Sun Microsystems, Inc. All rights reserved.
+ * Copyright 2008 Sun Microsystems, Inc. All rights reserved.
* Use is subject to license terms.
*/
@@ -87,6 +87,7 @@
#include <sys/wait.h>
#include <assert.h>
+#include <string.h>
#include <strings.h>
#include <signal.h>
#include <unistd.h>
@@ -948,6 +949,77 @@
}
static void
+dt_action_printm(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
+{
+ dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp);
+
+ dt_node_t *size = dnp->dn_args;
+ dt_node_t *addr = dnp->dn_args->dn_list;
+
+ char n[DT_TYPE_NAMELEN];
+
+ if (dt_node_is_posconst(size) == 0) {
+ dnerror(size, D_PRINTM_SIZE, "printm( ) argument #1 must "
+ "be a non-zero positive integral constant expression\n");
+ }
+
+ if (dt_node_is_pointer(addr) == 0) {
+ dnerror(addr, D_PRINTM_ADDR,
+ "printm( ) argument #2 is incompatible with "
+ "prototype:\n\tprototype: pointer\n"
+ "\t argument: %s\n",
+ dt_node_type_name(addr, n, sizeof (n)));
+ }
+
+ dt_cg(yypcb, addr);
+ ap->dtad_difo = dt_as(yypcb);
+ ap->dtad_kind = DTRACEACT_PRINTM;
+
+ ap->dtad_difo->dtdo_rtype.dtdt_flags |= DIF_TF_BYREF;
+ ap->dtad_difo->dtdo_rtype.dtdt_size = size->dn_value + sizeof(uintptr_t);
+}
+
+static void
+dt_action_printt(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
+{
+ dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp);
+
+ dt_node_t *size = dnp->dn_args;
+ dt_node_t *addr = dnp->dn_args->dn_list;
+
+ char n[DT_TYPE_NAMELEN];
+
+ if (dt_node_is_posconst(size) == 0) {
+ dnerror(size, D_PRINTT_SIZE, "printt( ) argument #1 must "
+ "be a non-zero positive integral constant expression\n");
+ }
+
+ if (addr == NULL || addr->dn_kind != DT_NODE_FUNC ||
+ addr->dn_ident != dt_idhash_lookup(dtp->dt_globals, "typeref")) {
+ dnerror(addr, D_PRINTT_ADDR,
+ "printt( ) argument #2 is incompatible with "
+ "prototype:\n\tprototype: typeref()\n"
+ "\t argument: %s\n",
+ dt_node_type_name(addr, n, sizeof (n)));
+ }
+
+ dt_cg(yypcb, addr);
+ ap->dtad_difo = dt_as(yypcb);
+ ap->dtad_kind = DTRACEACT_PRINTT;
+
+ ap->dtad_difo->dtdo_rtype.dtdt_flags |= DIF_TF_BYREF;
+
+ /*
+ * Allow additional buffer space for the data size, type size,
+ * type string length and a stab in the dark (32 bytes) for the
+ * type string. The type string is part of the typeref() that
+ * this action references.
+ */
+ ap->dtad_difo->dtdo_rtype.dtdt_size = size->dn_value + 3 * sizeof(uintptr_t) + 32;
+
+}
+
+static void
dt_action_commit(dtrace_hdl_t *dtp, dt_node_t *dnp, dtrace_stmtdesc_t *sdp)
{
dtrace_actdesc_t *ap = dt_stmt_action(dtp, sdp);
@@ -1013,6 +1085,12 @@
case DT_ACT_PRINTF:
dt_action_printflike(dtp, dnp->dn_expr, sdp, DTRACEACT_PRINTF);
break;
+ case DT_ACT_PRINTM:
+ dt_action_printm(dtp, dnp->dn_expr, sdp);
+ break;
+ case DT_ACT_PRINTT:
+ dt_action_printt(dtp, dnp->dn_expr, sdp);
+ break;
case DT_ACT_RAISE:
dt_action_raise(dtp, dnp->dn_expr, sdp);
break;
@@ -1589,7 +1667,9 @@
char **argv = malloc(sizeof (char *) * (argc + 5));
FILE *ofp = tmpfile();
+#if defined(sun)
char ipath[20], opath[20]; /* big enough for /dev/fd/ + INT_MAX + \0 */
+#endif
char verdef[32]; /* big enough for -D__SUNW_D_VERSION=0x%08x + \0 */
struct sigaction act, oact;
@@ -1597,7 +1677,11 @@
int wstat, estat;
pid_t pid;
+#if defined(sun)
off64_t off;
+#else
+ off_t off = 0;
+#endif
int c;
if (argv == NULL || ofp == NULL) {
@@ -1624,8 +1708,10 @@
(void) fseeko64(ifp, off, SEEK_SET);
}
+#if defined(sun)
(void) snprintf(ipath, sizeof (ipath), "/dev/fd/%d", fileno(ifp));
(void) snprintf(opath, sizeof (opath), "/dev/fd/%d", fileno(ofp));
+#endif
bcopy(dtp->dt_cpp_argv, argv, sizeof (char *) * argc);
@@ -1633,6 +1719,7 @@
"-D__SUNW_D_VERSION=0x%08x", dtp->dt_vmax);
argv[argc++] = verdef;
+#if defined(sun)
switch (dtp->dt_stdcmode) {
case DT_STDC_XA:
case DT_STDC_XT:
@@ -1645,6 +1732,9 @@
argv[argc++] = ipath;
argv[argc++] = opath;
+#else
+ argv[argc++] = "-P";
+#endif
argv[argc] = NULL;
/*
@@ -1671,6 +1761,12 @@
}
if (pid == 0) {
+#if !defined(sun)
+ if (isatty(fileno(ifp)) == 0)
+ lseek(fileno(ifp), off, SEEK_SET);
+ dup2(fileno(ifp), 0);
+ dup2(fileno(ofp), 1);
+#endif
(void) execvp(dtp->dt_cpp_path, argv);
_exit(errno == ENOENT ? 127 : 126);
}
@@ -2010,8 +2106,10 @@
dt_dprintf("skipping library %s: %s\n",
dld->dtld_library,
dtrace_errmsg(dtp, dtrace_errno(dtp)));
- } else
+ } else {
+ dld->dtld_loaded = B_TRUE;
dt_program_destroy(dtp, pgp);
+ }
}
dt_lib_depend_free(dtp);
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_cg.c#5 (text) ====
@@ -267,7 +267,7 @@
* properties are used to compute shift as USHIFT or SSHIFT, below.
*/
if (dnp->dn_flags & DT_NF_SIGNED) {
-#ifdef _BIG_ENDIAN
+#if BYTE_ORDER == _BIG_ENDIAN
shift = clp2(P2ROUNDUP(e.cte_bits, NBBY) / NBBY) * NBBY -
mp->ctm_offset % NBBY;
#else
@@ -281,7 +281,7 @@
instr = DIF_INSTR_FMT(DIF_OP_SRA, r1, r2, r1);
dt_irlist_append(dlp, dt_cg_node_alloc(DT_LBL_NONE, instr));
} else {
-#ifdef _BIG_ENDIAN
+#if BYTE_ORDER == _BIG_ENDIAN
shift = clp2(P2ROUNDUP(e.cte_bits, NBBY) / NBBY) * NBBY -
(mp->ctm_offset % NBBY + e.cte_bits);
#else
@@ -369,7 +369,7 @@
* input register to width cte_bits, and cmask as the mask used to
* pass through the containing bits and zero the field bits.
*/
-#ifdef _BIG_ENDIAN
+#if BYTE_ORDER == _BIG_ENDIAN
shift = clp2(P2ROUNDUP(e.cte_bits, NBBY) / NBBY) * NBBY -
(m.ctm_offset % NBBY + e.cte_bits);
#else
@@ -1339,6 +1339,40 @@
}
static void
+dt_cg_func_typeref(dtrace_hdl_t *dtp, dt_node_t *dnp)
+{
+ dtrace_typeinfo_t dtt;
+ dt_node_t *addr = dnp->dn_args;
+ dt_node_t *nelm = addr->dn_list;
+ dt_node_t *strp = nelm->dn_list;
+ dt_node_t *typs = strp->dn_list;
+ char buf[DT_TYPE_NAMELEN];
+ char *p;
+
+ ctf_type_name(addr->dn_ctfp, addr->dn_type, buf, sizeof (buf));
+
+ /*
+ * XXX Hack alert! XXX
+ * The prototype has two dummy args that we munge to represent
+ * the type string and the type size.
+ *
+ * Yes, I hear your grumble, but it works for now. We'll come
+ * up with a more elegant implementation later. :-)
+ */
+ free(strp->dn_string);
+
+ if ((p = strchr(buf, '*')) != NULL)
+ *p = '\0';
+
+ strp->dn_string = strdup(buf);
+
+ if (dtrace_lookup_by_type(dtp, DTRACE_OBJ_EVERY, buf, &dtt) < 0)
+ return;
+
+ typs->dn_value = ctf_type_size(dtt.dtt_ctfp, dtt.dtt_type);
+}
+
+static void
dt_cg_node(dt_node_t *dnp, dt_irlist_t *dlp, dt_regset_t *drp)
{
ctf_file_t *ctfp = dnp->dn_ctfp;
@@ -1793,7 +1827,9 @@
}
switch (dnp->dn_kind) {
- case DT_NODE_FUNC:
+ case DT_NODE_FUNC: {
+ dtrace_hdl_t *dtp = yypcb->pcb_hdl;
+
if ((idp = dnp->dn_ident)->di_kind != DT_IDENT_FUNC) {
dnerror(dnp, D_CG_EXPR, "%s %s( ) may not be "
"called from a D expression (D program "
@@ -1801,6 +1837,15 @@
dt_idkind_name(idp->di_kind), idp->di_name);
}
+ switch (idp->di_id) {
+ case DIF_SUBR_TYPEREF:
+ dt_cg_func_typeref(dtp, dnp);
+ break;
+
+ default:
+ break;
+ }
+
dt_cg_arglist(dnp->dn_ident, dnp->dn_args, dlp, drp);
if ((dnp->dn_reg = dt_regset_alloc(drp)) == -1)
@@ -1813,6 +1858,7 @@
dt_cg_node_alloc(DT_LBL_NONE, instr));
break;
+ }
case DT_NODE_VAR:
if (dnp->dn_ident->di_kind == DT_IDENT_XLSOU ||
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_consume.c#5 (text) ====
@@ -32,7 +32,9 @@
#include <limits.h>
#include <assert.h>
#include <ctype.h>
+#if defined(sun)
#include <alloca.h>
+#endif
#include <dt_impl.h>
#define DT_MASK_LO 0x00000000FFFFFFFFULL
@@ -710,7 +712,7 @@
/*ARGSUSED*/
int
dt_print_bytes(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr,
- size_t nbytes, int width, int quiet)
+ size_t nbytes, int width, int quiet, int raw)
{
/*
* If the byte stream is a series of printable characters, followed by
@@ -723,7 +725,7 @@
if (nbytes == 0)
return (0);
- if (dtp->dt_options[DTRACEOPT_RAWBYTES] != DTRACEOPT_UNSET)
+ if (raw || dtp->dt_options[DTRACEOPT_RAWBYTES] != DTRACEOPT_UNSET)
goto raw;
for (i = 0; i < nbytes; i++) {
@@ -858,7 +860,7 @@
return (dt_set_errno(dtp, EDT_BADSTACKPC));
}
- if (pc == NULL)
+ if (pc == 0)
break;
addr += size;
@@ -946,15 +948,23 @@
if (P != NULL)
dt_proc_lock(dtp, P); /* lock handle while we perform lookups */
- for (i = 0; i < depth && pc[i] != NULL; i++) {
+ for (i = 0; i < depth && pc[i] != 0; i++) {
const prmap_t *map;
if ((err = dt_printf(dtp, fp, "%*s", indent, "")) < 0)
break;
+#if defined(sun)
if (P != NULL && Plookup_by_addr(P, pc[i],
+#else
+ if (P != NULL && proc_addr2sym(P, pc[i],
+#endif
name, sizeof (name), &sym) == 0) {
+#if defined(sun)
(void) Pobjname(P, pc[i], objname, sizeof (objname));
+#else
+ (void) proc_objname(P, pc[i], objname, sizeof (objname));
+#endif
if (pc[i] > sym.st_value) {
(void) snprintf(c, sizeof (c),
@@ -965,8 +975,12 @@
"%s`%s", dt_basename(objname), name);
}
} else if (str != NULL && str[0] != '\0' && str[0] != '@' &&
+#if defined(sun)
(P != NULL && ((map = Paddr_to_map(P, pc[i])) == NULL ||
(map->pr_mflags & MA_WRITE)))) {
+#else
+ (P != NULL && ((map = proc_addr2map(P, pc[i])) == NULL))) {
+#endif
/*
* If the current string pointer in the string table
* does not point to an empty string _and_ the program
@@ -982,8 +996,12 @@
*/
(void) snprintf(c, sizeof (c), "%s", str);
} else {
+#if defined(sun)
if (P != NULL && Pobjname(P, pc[i], objname,
- sizeof (objname)) != NULL) {
+#else
+ if (P != NULL && proc_objname(P, pc[i], objname,
+#endif
+ sizeof (objname)) != 0) {
(void) snprintf(c, sizeof (c), "%s`0x%llx",
dt_basename(objname), (u_longlong_t)pc[i]);
} else {
@@ -1052,7 +1070,11 @@
dt_proc_lock(dtp, P);
+#if defined(sun)
if (Plookup_by_addr(P, pc, NULL, 0, &sym) == 0)
+#else
+ if (proc_addr2sym(P, pc, NULL, 0, &sym) == 0)
+#endif
pc = sym.st_value;
dt_proc_unlock(dtp, P);
@@ -1095,7 +1117,11 @@
if (P != NULL)
dt_proc_lock(dtp, P); /* lock handle while we perform lookups */
- if (P != NULL && Pobjname(P, pc, objname, sizeof (objname)) != NULL) {
+#if defined(sun)
+ if (P != NULL && Pobjname(P, pc, objname, sizeof (objname)) != 0) {
+#else
+ if (P != NULL && proc_objname(P, pc, objname, sizeof (objname)) != 0) {
+#endif
(void) snprintf(c, sizeof (c), "%s", dt_basename(objname));
} else {
(void) snprintf(c, sizeof (c), "0x%llx", (u_longlong_t)pc);
@@ -1111,7 +1137,315 @@
return (err);
}
+int
+dt_print_memory(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr)
+{
+ int quiet = (dtp->dt_options[DTRACEOPT_QUIET] != DTRACEOPT_UNSET);
+ size_t nbytes = *((uintptr_t *) addr);
+
+ return (dt_print_bytes(dtp, fp, addr + sizeof(uintptr_t),
+ nbytes, 50, quiet, 1));
+}
+
+typedef struct dt_type_cbdata {
+ dtrace_hdl_t *dtp;
+ dtrace_typeinfo_t dtt;
+ caddr_t addr;
+ caddr_t addrend;
+ const char *name;
+ int f_type;
+ int indent;
+ int type_width;
+ int name_width;
+ FILE *fp;
+} dt_type_cbdata_t;
+
+static int dt_print_type_data(dt_type_cbdata_t *, ctf_id_t);
+
+static int
+dt_print_type_member(const char *name, ctf_id_t type, ulong_t off, void *arg)
+{
+ dt_type_cbdata_t cbdata;
+ dt_type_cbdata_t *cbdatap = arg;
+ ssize_t ssz;
+
+ if ((ssz = ctf_type_size(cbdatap->dtt.dtt_ctfp, type)) <= 0)
+ return (0);
+
+ off /= 8;
+
+ cbdata = *cbdatap;
+ cbdata.name = name;
+ cbdata.addr += off;
+ cbdata.addrend = cbdata.addr + ssz;
+
+ return (dt_print_type_data(&cbdata, type));
+}
+
+static int
+dt_print_type_width(const char *name, ctf_id_t type, ulong_t off, void *arg)
+{
+ char buf[DT_TYPE_NAMELEN];
+ char *p;
+ dt_type_cbdata_t *cbdatap = arg;
+ size_t sz = strlen(name);
+
+ ctf_type_name(cbdatap->dtt.dtt_ctfp, type, buf, sizeof (buf));
+
+ if ((p = strchr(buf, '[')) != NULL)
+ p[-1] = '\0';
+ else
+ p = "";
+
+ sz += strlen(p);
+
+ if (sz > cbdatap->name_width)
+ cbdatap->name_width = sz;
+
+ sz = strlen(buf);
+
+ if (sz > cbdatap->type_width)
+ cbdatap->type_width = sz;
+
+ return (0);
+}
+
+static int
+dt_print_type_data(dt_type_cbdata_t *cbdatap, ctf_id_t type)
+{
+ caddr_t addr = cbdatap->addr;
+ caddr_t addrend = cbdatap->addrend;
+ char buf[DT_TYPE_NAMELEN];
+ char *p;
+ int cnt = 0;
+ uint_t kind = ctf_type_kind(cbdatap->dtt.dtt_ctfp, type);
+ ssize_t ssz = ctf_type_size(cbdatap->dtt.dtt_ctfp, type);
+
+ ctf_type_name(cbdatap->dtt.dtt_ctfp, type, buf, sizeof (buf));
+
+ if ((p = strchr(buf, '[')) != NULL)
+ p[-1] = '\0';
+ else
+ p = "";
+
+ if (cbdatap->f_type) {
+ int type_width = roundup(cbdatap->type_width + 1, 4);
+ int name_width = roundup(cbdatap->name_width + 1, 4);
+
+ name_width -= strlen(cbdatap->name);
+
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%*s%-*s%s%-*s = ",cbdatap->indent * 4,"",type_width,buf,cbdatap->name,name_width,p);
+ }
+
+ while (addr < addrend) {
+ dt_type_cbdata_t cbdata;
+ ctf_arinfo_t arinfo;
+ ctf_encoding_t cte;
+ uintptr_t *up;
+ void *vp = addr;
+ cbdata = *cbdatap;
+ cbdata.name = "";
+ cbdata.addr = addr;
+ cbdata.addrend = addr + ssz;
+ cbdata.f_type = 0;
+ cbdata.indent++;
+ cbdata.type_width = 0;
+ cbdata.name_width = 0;
+
+ if (cnt > 0)
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%*s", cbdatap->indent * 4,"");
+
+ switch (kind) {
+ case CTF_K_INTEGER:
+ if (ctf_type_encoding(cbdatap->dtt.dtt_ctfp, type, &cte) != 0)
+ return (-1);
+ if ((cte.cte_format & CTF_INT_SIGNED) != 0)
+ switch (cte.cte_bits) {
+ case 8:
+ if (isprint(*((char *) vp)))
+ dt_printf(cbdatap->dtp, cbdatap->fp, "'%c', ", *((char *) vp));
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%d (0x%x);\n", *((char *) vp), *((char *) vp));
+ break;
+ case 16:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%hd (0x%hx);\n", *((short *) vp), *((u_short *) vp));
+ break;
+ case 32:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%d (0x%x);\n", *((int *) vp), *((u_int *) vp));
+ break;
+ case 64:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%jd (0x%jx);\n", *((long long *) vp), *((unsigned long long *) vp));
+ break;
+ default:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "CTF_K_INTEGER: format %x offset %u bits %u\n",cte.cte_format,cte.cte_offset,cte.cte_bits);
+ break;
+ }
+ else
+ switch (cte.cte_bits) {
+ case 8:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%u (0x%x);\n", *((uint8_t *) vp) & 0xff, *((uint8_t *) vp) & 0xff);
+ break;
+ case 16:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%hu (0x%hx);\n", *((u_short *) vp), *((u_short *) vp));
+ break;
+ case 32:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%u (0x%x);\n", *((u_int *) vp), *((u_int *) vp));
+ break;
+ case 64:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%ju (0x%jx);\n", *((unsigned long long *) vp), *((unsigned long long *) vp));
+ break;
+ default:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "CTF_K_INTEGER: format %x offset %u bits %u\n",cte.cte_format,cte.cte_offset,cte.cte_bits);
+ break;
+ }
+ break;
+ case CTF_K_FLOAT:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "CTF_K_FLOAT: format %x offset %u bits %u\n",cte.cte_format,cte.cte_offset,cte.cte_bits);
+ break;
+ case CTF_K_POINTER:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%p;\n", *((void **) addr));
+ break;
+ case CTF_K_ARRAY:
+ if (ctf_array_info(cbdatap->dtt.dtt_ctfp, type, &arinfo) != 0)
+ return (-1);
+ dt_printf(cbdatap->dtp, cbdatap->fp, "{\n%*s",cbdata.indent * 4,"");
+ dt_print_type_data(&cbdata, arinfo.ctr_contents);
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%*s};\n",cbdatap->indent * 4,"");
+ break;
+ case CTF_K_FUNCTION:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "CTF_K_FUNCTION:\n");
+ break;
+ case CTF_K_STRUCT:
+ cbdata.f_type = 1;
+ if (ctf_member_iter(cbdatap->dtt.dtt_ctfp, type,
+ dt_print_type_width, &cbdata) != 0)
+ return (-1);
+ dt_printf(cbdatap->dtp, cbdatap->fp, "{\n");
+ if (ctf_member_iter(cbdatap->dtt.dtt_ctfp, type,
+ dt_print_type_member, &cbdata) != 0)
+ return (-1);
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%*s};\n",cbdatap->indent * 4,"");
+ break;
+ case CTF_K_UNION:
+ cbdata.f_type = 1;
+ if (ctf_member_iter(cbdatap->dtt.dtt_ctfp, type,
+ dt_print_type_width, &cbdata) != 0)
+ return (-1);
+ dt_printf(cbdatap->dtp, cbdatap->fp, "{\n");
+ if (ctf_member_iter(cbdatap->dtt.dtt_ctfp, type,
+ dt_print_type_member, &cbdata) != 0)
+ return (-1);
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%*s};\n",cbdatap->indent * 4,"");
+ break;
+ case CTF_K_ENUM:
+ dt_printf(cbdatap->dtp, cbdatap->fp, "%s;\n", ctf_enum_name(cbdatap->dtt.dtt_ctfp, type, *((int *) vp)));
+ break;
+ case CTF_K_TYPEDEF:
+ dt_print_type_data(&cbdata, ctf_type_reference(cbdatap->dtt.dtt_ctfp,type));
+ break;
+ case CTF_K_VOLATILE:
+ if (cbdatap->f_type)
+ dt_printf(cbdatap->dtp, cbdatap->fp, "volatile ");
+ dt_print_type_data(&cbdata, ctf_type_reference(cbdatap->dtt.dtt_ctfp,type));
+ break;
+ case CTF_K_CONST:
+ if (cbdatap->f_type)
+ dt_printf(cbdatap->dtp, cbdatap->fp, "const ");
+ dt_print_type_data(&cbdata, ctf_type_reference(cbdatap->dtt.dtt_ctfp,type));
+ break;
+ case CTF_K_RESTRICT:
+ if (cbdatap->f_type)
+ dt_printf(cbdatap->dtp, cbdatap->fp, "restrict ");
+ dt_print_type_data(&cbdata, ctf_type_reference(cbdatap->dtt.dtt_ctfp,type));
+ break;
+ default:
+ break;
+ }
+
+ addr += ssz;
+ cnt++;
+ }
+
+ return (0);
+}
+
static int
+dt_print_type(dtrace_hdl_t *dtp, FILE *fp, caddr_t addr)
+{
+ caddr_t addrend;
+ char *p;
+ dtrace_typeinfo_t dtt;
+ dt_type_cbdata_t cbdata;
+ int num = 0;
+ int quiet = (dtp->dt_options[DTRACEOPT_QUIET] != DTRACEOPT_UNSET);
+ ssize_t ssz;
+
+ if (!quiet)
+ dt_printf(dtp, fp, "\n");
+
+ /* Get the total number of bytes of data buffered. */
+ size_t nbytes = *((uintptr_t *) addr);
+ addr += sizeof(uintptr_t);
+
+ /*
+ * Get the size of the type so that we can check that it matches
+ * the CTF data we look up and so that we can figure out how many
+ * type elements are buffered.
+ */
+ size_t typs = *((uintptr_t *) addr);
+ addr += sizeof(uintptr_t);
+
+ /*
+ * Point to the type string in the buffer. Get it's string
+ * length and round it up to become the offset to the start
+ * of the buffered type data which we would like to be aligned
+ * for easy access.
+ */
+ char *strp = (char *) addr;
+ int offset = roundup(strlen(strp) + 1, sizeof(uintptr_t));
+
+ /*
+ * The type string might have a format such as 'int [20]'.
+ * Check if there is an array dimension present.
+ */
+ if ((p = strchr(strp, '[')) != NULL) {
+ /* Strip off the array dimension. */
+ *p++ = '\0';
+
+ for (; *p != '\0' && *p != ']'; p++)
+ num = num * 10 + *p - '0';
+ } else
+ /* No array dimension, so default. */
+ num = 1;
+
+ /* Lookup the CTF type from the type string. */
+ if (dtrace_lookup_by_type(dtp, DTRACE_OBJ_EVERY, strp, &dtt) < 0)
+ return (-1);
+
+ /* Offset the buffer address to the start of the data... */
+ addr += offset;
+
+ ssz = ctf_type_size(dtt.dtt_ctfp, dtt.dtt_type);
+
+ if (typs != ssz) {
+ printf("Expected type size from buffer (%lu) to match type size looked up now (%ld)\n", (u_long) typs, (long) ssz);
+ return (-1);
+ }
+
+ cbdata.dtp = dtp;
+ cbdata.dtt = dtt;
+ cbdata.name = "";
+ cbdata.addr = addr;
+ cbdata.addrend = addr + nbytes;
+ cbdata.indent = 1;
+ cbdata.f_type = 1;
+ cbdata.type_width = 0;
+ cbdata.name_width = 0;
+ cbdata.fp = fp;
+
+ return (dt_print_type_data(&cbdata, dtt.dtt_type));
+}
+
+static int
dt_print_sym(dtrace_hdl_t *dtp, FILE *fp, const char *format, caddr_t addr)
{
/* LINTED - alignment */
@@ -1430,7 +1764,7 @@
(uint32_t)normal);
break;
default:
- err = dt_print_bytes(dtp, fp, addr, size, 50, 0);
+ err = dt_print_bytes(dtp, fp, addr, size, 50, 0, 0);
break;
}
@@ -1805,6 +2139,18 @@
goto nextrec;
}
+ if (act == DTRACEACT_PRINTM) {
+ if (dt_print_memory(dtp, fp, addr) < 0)
+ return (-1);
+ goto nextrec;
+ }
+
+ if (act == DTRACEACT_PRINTT) {
+ if (dt_print_type(dtp, fp, addr) < 0)
+ return (-1);
+ goto nextrec;
+ }
+
if (DTRACEACT_ISPRINTFLIKE(act)) {
void *fmtdata;
int (*func)(dtrace_hdl_t *, FILE *, void *,
@@ -1935,7 +2281,7 @@
break;
default:
n = dt_print_bytes(dtp, fp, addr,
- rec->dtrd_size, 33, quiet);
+ rec->dtrd_size, 33, quiet, 0);
break;
}
@@ -2064,13 +2410,20 @@
dt_begin_t begin;
processorid_t cpu = dtp->dt_beganon;
dtrace_bufdesc_t nbuf;
+#if !defined(sun)
+ dtrace_bufdesc_t *pbuf;
+#endif
int rval, i;
static int max_ncpus;
dtrace_optval_t size;
dtp->dt_beganon = -1;
+#if defined(sun)
if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, buf) == -1) {
+#else
+ if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &buf) == -1) {
+#endif
/*
* We really don't expect this to fail, but it is at least
* technically possible for this to fail with ENOENT. In this
@@ -2132,7 +2485,12 @@
if (i == cpu)
continue;
+#if defined(sun)
if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &nbuf) == -1) {
+#else
+ pbuf = &nbuf;
+ if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &pbuf) == -1) {
+#endif
/*
* If we failed with ENOENT, it may be because the
* CPU was unconfigured -- this is okay. Any other
@@ -2239,7 +2597,11 @@
if (dtp->dt_stopped && (i == dtp->dt_endedon))
continue;
+#if defined(sun)
if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, buf) == -1) {
+#else
+ if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &buf) == -1) {
+#endif
/*
* If we failed with ENOENT, it may be because the
* CPU was unconfigured -- this is okay. Any other
@@ -2260,7 +2622,11 @@
buf->dtbd_cpu = dtp->dt_endedon;
+#if defined(sun)
if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, buf) == -1) {
+#else
+ if (dt_ioctl(dtp, DTRACEIOC_BUFSNAP, &buf) == -1) {
+#endif
/*
* This _really_ shouldn't fail, but it is strictly speaking
* possible for this to return ENOENT if the CPU that called
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_dof.c#5 (text) ====
@@ -27,10 +27,14 @@
#pragma ident "%Z%%M% %I% %E% SMI"
#include <sys/types.h>
+#if defined(sun)
#include <sys/sysmacros.h>
+#endif
#include <strings.h>
+#if defined(sun)
#include <alloca.h>
+#endif
#include <assert.h>
#include <stdlib.h>
#include <errno.h>
==== //depot/projects/dtrace/src/cddl/contrib/opensolaris/lib/libdtrace/common/dt_error.c#5 (text) ====
@@ -25,6 +25,7 @@
#pragma ident "%Z%%M% %I% %E% SMI"
+#include <string.h>
#include <strings.h>
#include <dt_impl.h>
@@ -138,12 +139,29 @@
return (dtp->dt_errno);
}
+#if defined(sun)
int
dt_set_errno(dtrace_hdl_t *dtp, int err)
{
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 09:14:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 2C0F2106567A; Sat, 26 Apr 2008 09:14:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id E280F106564A
for <perforce@freebsd.org>; Sat, 26 Apr 2008 09:14:54 +0000 (UTC)
(envelope-from pjd@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id BD7308FC18
for <perforce@freebsd.org>; Sat, 26 Apr 2008 09:14:54 +0000 (UTC)
(envelope-from pjd@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3Q9EsRY048269
for <perforce@freebsd.org>; Sat, 26 Apr 2008 09:14:54 GMT
(envelope-from pjd@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3Q9Esrn048267
for perforce@freebsd.org; Sat, 26 Apr 2008 09:14:54 GMT
(envelope-from pjd@freebsd.org)
Date: Sat, 26 Apr 2008 09:14:54 GMT
Message-Id: <200804260914.m3Q9Esrn048267@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pjd@freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140662 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 09:14:55 -0000
http://perforce.freebsd.org/chv.cgi?CH=140662
Change 140662 by pjd@pjd_anger on 2008/04/26 09:13:57
We have to call callout_stop() with IWN lock held.
Affected files ...
.. //depot/projects/vap/sys/dev/iwn/if_iwn.c#12 edit
Differences ...
==== //depot/projects/vap/sys/dev/iwn/if_iwn.c#12 (text+kox) ====
@@ -973,7 +973,9 @@
ieee80211_state_name[vap->iv_state],
ieee80211_state_name[nstate]);
+ IWN_LOCK(sc);
callout_stop(&sc->sc_timer_to);
+ IWN_UNLOCK(sc);
/*
* Some state transitions require issuing a configure request
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 09:14:56 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id EB350106572B; Sat, 26 Apr 2008 09:14:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 110A31065678
for <perforce@freebsd.org>; Sat, 26 Apr 2008 09:14:55 +0000 (UTC)
(envelope-from pjd@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id E04EA8FC1B
for <perforce@freebsd.org>; Sat, 26 Apr 2008 09:14:54 +0000 (UTC)
(envelope-from pjd@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3Q9EsLV048274
for <perforce@freebsd.org>; Sat, 26 Apr 2008 09:14:54 GMT
(envelope-from pjd@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3Q9EsIg048272
for perforce@freebsd.org; Sat, 26 Apr 2008 09:14:54 GMT
(envelope-from pjd@freebsd.org)
Date: Sat, 26 Apr 2008 09:14:54 GMT
Message-Id: <200804260914.m3Q9EsIg048272@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
pjd@freebsd.org using -f
From: Pawel Jakub Dawidek <pjd@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140663 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 09:14:56 -0000
http://perforce.freebsd.org/chv.cgi?CH=140663
Change 140663 by pjd@pjd_anger on 2008/04/26 09:14:46
Add iwn and iwnfw to the modules build for i386.
Affected files ...
.. //depot/projects/vap/sys/modules/Makefile#22 edit
Differences ...
==== //depot/projects/vap/sys/modules/Makefile#22 (text+ko) ====
@@ -137,6 +137,8 @@
ispfw \
${_iwi} \
${_iwifw} \
+ ${_iwn} \
+ ${_iwnfw} \
${_ixgb} \
joy \
${_k8temp} \
@@ -471,6 +473,8 @@
_ipwfw= ipwfw
_iwi= iwi
_iwifw= iwifw
+_iwn= iwn
+_iwnfw= iwnfw
_ixgb= ixgb
_mly= mly
_nfe= nfe
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 11:25:11 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 4EC961065678; Sat, 26 Apr 2008 11:25:11 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 105491065673
for <perforce@FreeBSD.org>; Sat, 26 Apr 2008 11:25:11 +0000 (UTC)
(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 021178FC17
for <perforce@FreeBSD.org>; Sat, 26 Apr 2008 11:25:11 +0000 (UTC)
(envelope-from diego@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QBPAHQ055633
for <perforce@FreeBSD.org>; Sat, 26 Apr 2008 11:25:10 GMT
(envelope-from diego@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QBPA6Y055631
for perforce@freebsd.org; Sat, 26 Apr 2008 11:25:10 GMT
(envelope-from diego@FreeBSD.org)
Date: Sat, 26 Apr 2008 11:25:10 GMT
Message-Id: <200804261125.m3QBPA6Y055631@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
diego@FreeBSD.org using -f
From: Diego Giagio <diego@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140666 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 11:25:11 -0000
http://perforce.freebsd.org/chv.cgi?CH=140666
Change 140666 by diego@diego_black on 2008/04/26 11:24:10
IFC
Affected files ...
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/arm/arm/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files.sparc64#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/conf/files.sun4v#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/ddb/db_capture.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_82571.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_82571.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_api.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_api.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_defines.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_hw.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_ich8lan.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_ich8lan.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_osdep.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_phy.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_phy.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/hme/if_hmereg.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_82575.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_api.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_api.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_defines.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_hw.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_mac.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_manage.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_osdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_osdep.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/e1000_phy.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/if_igb.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/igb/if_igb.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/if_rum.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/if_udav.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/dev/vx/if_vx.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/i386/include/pcpu.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/mips/mips/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/modules/em/Makefile#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/aim/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/powerpc/booke/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/security/audit/audit.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/pci/ofw_pci.h#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/pci/ofw_pci_if.m#2 delete
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/soc2008/diego-audit/src/sys/sys/proc.h#2 integrate
Differences ...
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/machdep.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.686 2008/04/25 05:18:47 jeff Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -53,6 +53,7 @@
#include "opt_maxmem.h"
#include "opt_msgbuf.h"
#include "opt_perfmon.h"
+#include "opt_sched.h"
#include <sys/param.h>
#include <sys/proc.h>
@@ -527,62 +528,192 @@
__asm__ ("hlt");
}
+void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */
+
+static void
+cpu_idle_hlt(int busy)
+{
+ /*
+ * we must absolutely guarentee that hlt is the next instruction
+ * after sti or we introduce a timing window.
+ */
+ disable_intr();
+ if (sched_runnable())
+ enable_intr();
+ else
+ __asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_acpi(int busy)
+{
+ disable_intr();
+ if (sched_runnable())
+ enable_intr();
+ else if (cpu_idle_hook)
+ cpu_idle_hook();
+ else
+ __asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_spin(int busy)
+{
+ return;
+}
+
+void (*cpu_idle_fn)(int) = cpu_idle_acpi;
+
+void
+cpu_idle(int busy)
+{
+#ifdef SMP
+ if (mp_grab_cpu_hlt())
+ return;
+#endif
+ cpu_idle_fn(busy);
+}
+
/*
- * Hook to idle the CPU when possible. In the SMP case we default to
- * off because a halted cpu will not currently pick up a new thread in the
- * run queue until the next timer tick. If turned on this will result in
- * approximately a 4.2% loss in real time performance in buildworld tests
- * (but improves user and sys times oddly enough), and saves approximately
- * 5% in power consumption on an idle machine (tests w/2xCPU 1.1GHz P3).
- *
- * XXX we need to have a cpu mask of idle cpus and generate an IPI or
- * otherwise generate some sort of interrupt to wake up cpus sitting in HLT.
- * Then we can have our cake and eat it too.
- *
- * XXX I'm turning it on for SMP as well by default for now. It seems to
- * help lock contention somewhat, and this is critical for HTT. -Peter
+ * mwait cpu power states. Lower 4 bits are sub-states.
*/
-static int cpu_idle_hlt = 1;
-TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt);
-SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
- &cpu_idle_hlt, 0, "Idle loop HLT enable");
+#define MWAIT_C0 0xf0
+#define MWAIT_C1 0x00
+#define MWAIT_C2 0x10
+#define MWAIT_C3 0x20
+#define MWAIT_C4 0x30
+
+#define MWAIT_DISABLED 0x0
+#define MWAIT_WOKEN 0x1
+#define MWAIT_WAITING 0x2
+
+static void
+cpu_idle_mwait(int busy)
+{
+ int *mwait;
+
+ mwait = (int *)PCPU_PTR(monitorbuf);
+ *mwait = MWAIT_WAITING;
+ if (sched_runnable())
+ return;
+ cpu_monitor(mwait, 0, 0);
+ if (*mwait == MWAIT_WAITING)
+ cpu_mwait(0, MWAIT_C1);
+}
static void
-cpu_idle_default(void)
+cpu_idle_mwait_hlt(int busy)
+{
+ int *mwait;
+
+ mwait = (int *)PCPU_PTR(monitorbuf);
+ if (busy == 0) {
+ *mwait = MWAIT_DISABLED;
+ cpu_idle_hlt(busy);
+ return;
+ }
+ *mwait = MWAIT_WAITING;
+ if (sched_runnable())
+ return;
+ cpu_monitor(mwait, 0, 0);
+ if (*mwait == MWAIT_WAITING)
+ cpu_mwait(0, MWAIT_C1);
+}
+
+int
+cpu_idle_wakeup(int cpu)
{
+ struct pcpu *pcpu;
+ int *mwait;
+
+ if (cpu_idle_fn == cpu_idle_spin)
+ return (1);
+ if (cpu_idle_fn != cpu_idle_mwait && cpu_idle_fn != cpu_idle_mwait_hlt)
+ return (0);
+ pcpu = pcpu_find(cpu);
+ mwait = (int *)pcpu->pc_monitorbuf;
/*
- * we must absolutely guarentee that hlt is the
- * absolute next instruction after sti or we
- * introduce a timing window.
+ * This doesn't need to be atomic since missing the race will
+ * simply result in unnecessary IPIs.
*/
- __asm __volatile("sti; hlt");
+ if (cpu_idle_fn == cpu_idle_mwait_hlt && *mwait == MWAIT_DISABLED)
+ return (0);
+ *mwait = MWAIT_WOKEN;
+
+ return (1);
}
/*
- * Note that we have to be careful here to avoid a race between checking
- * sched_runnable() and actually halting. If we don't do this, we may waste
- * the time between calling hlt and the next interrupt even though there
- * is a runnable process.
+ * Ordered by speed/power consumption.
*/
-void
-cpu_idle(void)
+struct {
+ void *id_fn;
+ char *id_name;
+} idle_tbl[] = {
+ { cpu_idle_spin, "spin" },
+ { cpu_idle_mwait, "mwait" },
+ { cpu_idle_mwait_hlt, "mwait_hlt" },
+ { cpu_idle_hlt, "hlt" },
+ { cpu_idle_acpi, "acpi" },
+ { NULL, NULL }
+};
+
+static int
+idle_sysctl_available(SYSCTL_HANDLER_ARGS)
+{
+ char *avail, *p;
+ int error;
+ int i;
+
+ avail = malloc(256, M_TEMP, M_WAITOK);
+ p = avail;
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (strstr(idle_tbl[i].id_name, "mwait") &&
+ (cpu_feature2 & CPUID2_MON) == 0)
+ continue;
+ p += sprintf(p, "%s, ", idle_tbl[i].id_name);
+ }
+ error = sysctl_handle_string(oidp, avail, 0, req);
+ free(avail, M_TEMP);
+ return (error);
+}
+
+static int
+idle_sysctl(SYSCTL_HANDLER_ARGS)
{
+ char buf[16];
+ int error;
+ char *p;
+ int i;
-#ifdef SMP
- if (mp_grab_cpu_hlt())
- return;
-#endif
- if (cpu_idle_hlt) {
- disable_intr();
- if (sched_runnable())
- enable_intr();
- else
- (*cpu_idle_hook)();
+ p = "unknown";
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (idle_tbl[i].id_fn == cpu_idle_fn) {
+ p = idle_tbl[i].id_name;
+ break;
+ }
+ }
+ strncpy(buf, p, sizeof(buf));
+ error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
+ if (error != 0 || req->newptr == NULL)
+ return (error);
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (strstr(idle_tbl[i].id_name, "mwait") &&
+ (cpu_feature2 & CPUID2_MON) == 0)
+ continue;
+ if (strcmp(idle_tbl[i].id_name, buf))
+ continue;
+ cpu_idle_fn = idle_tbl[i].id_fn;
+ return (0);
}
+ return (EINVAL);
}
-/* Other subsystems (e.g., ACPI) can hook this later. */
-void (*cpu_idle_hook)(void) = cpu_idle_default;
+SYSCTL_PROC(_machdep, OID_AUTO, idle_available, CTLTYPE_STRING | CTLFLAG_RD,
+ 0, 0, idle_sysctl_available, "A", "list of available idle functions");
+
+SYSCTL_PROC(_machdep, OID_AUTO, idle, CTLTYPE_STRING | CTLFLAG_RW, 0, 0,
+ idle_sysctl, "A", "currently selected idle function");
/*
* Clear registers on exec
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/amd64/pmap.c#2 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.614 2008/04/10 16:04:50 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $");
/*
* Manages physical address maps.
@@ -2266,7 +2266,7 @@
* the 2mpage to referencing the page table page.
*/
if ((oldpde & PG_MANAGED) != 0)
- pmap_pv_demote_pde(pmap, va, oldpde & PG_FRAME);
+ pmap_pv_demote_pde(pmap, va, oldpde & PG_PS_FRAME);
pmap_pde_demotions++;
CTR2(KTR_PMAP, "pmap_demote_pde: success for va %#lx"
@@ -2301,10 +2301,10 @@
pmap_invalidate_page(kernel_pmap, sva);
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
if (oldpde & PG_MANAGED) {
- pvh = pa_to_pvh(oldpde & PG_FRAME);
+ pvh = pa_to_pvh(oldpde & PG_PS_FRAME);
pmap_pvh_free(pvh, pmap, sva);
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
vm_page_dirty(m);
@@ -2600,7 +2600,7 @@
oldpde = newpde = *pde;
if (oldpde & PG_MANAGED) {
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
/*
* In contrast to the analogous operation on a 4KB page
@@ -2839,7 +2839,7 @@
* Promote the pv entries.
*/
if ((newpde & PG_MANAGED) != 0)
- pmap_pv_promote_pde(pmap, va, newpde & PG_FRAME);
+ pmap_pv_promote_pde(pmap, va, newpde & PG_PS_FRAME);
/*
* Propagate the PAT index to its proper position.
@@ -3820,7 +3820,7 @@
pc->pc_map[field] |= bitmask;
if ((tpte & PG_PS) != 0) {
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
- pvh = pa_to_pvh(tpte & PG_FRAME);
+ pvh = pa_to_pvh(tpte & PG_PS_FRAME);
TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
if (TAILQ_EMPTY(&pvh->pv_list)) {
for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
@@ -4029,7 +4029,7 @@
* table page.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
rtval++;
if (rtval > 4) {
@@ -4098,7 +4098,7 @@
* write access may repromote.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pte = pmap_pde_to_pte(pde, va);
oldpte = *pte;
if ((oldpte & PG_V) != 0) {
@@ -4163,7 +4163,8 @@
* fully populated, this removal never frees
* a page table page.
*/
- va += VM_PAGE_TO_PHYS(m) - (oldpde & PG_FRAME);
+ va += VM_PAGE_TO_PHYS(m) - (oldpde &
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
}
}
==== //depot/projects/soc2008/diego-audit/src/sys/amd64/include/pcpu.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.48 2007/06/04 21:38:45 attilio Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.49 2008/04/25 05:18:48 jeff Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -43,6 +43,7 @@
* other processors"
*/
#define PCPU_MD_FIELDS \
+ char pc_monitorbuf[128] __aligned(128); /* cache line */ \
struct pcpu *pc_prvspace; /* Self-reference */ \
struct pmap *pc_curpmap; \
struct amd64tss *pc_tssp; \
==== //depot/projects/soc2008/diego-audit/src/sys/arm/arm/machdep.c#2 (text+ko) ====
@@ -46,7 +46,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.31 2008/04/25 05:18:48 jeff Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -326,12 +326,19 @@
}
void
-cpu_idle(void)
+cpu_idle(int busy)
{
cpu_sleep(0);
}
int
+cpu_idle_wakeup(int cpu)
+{
+
+ return (0);
+}
+
+int
fill_regs(struct thread *td, struct reg *regs)
{
struct trapframe *tf = td->td_frame;
==== //depot/projects/soc2008/diego-audit/src/sys/conf/files#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -732,6 +732,48 @@
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
+ipwbssfw.c optional ipwbssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwbssfw.c"
+ipw_bss.fwo optional ipwbssfw | ipwfw \
+ dependency "ipw_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \
+ no-implicit-rule \
+ clean "ipw_bss.fwo"
+ipw_bss.fw optional ipwbssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_bss.fw"
+ipwibssfw.c optional ipwibssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwibssfw.c"
+ipw_ibss.fwo optional ipwibssfw | ipwfw \
+ dependency "ipw_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \
+ no-implicit-rule \
+ clean "ipw_ibss.fwo"
+ipw_ibss.fw optional ipwibssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_ibss.fw"
+ipwmonitorfw.c optional ipwmonitorfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwmonitorfw.c"
+ipw_monitor.fwo optional ipwmonitorfw | ipwfw \
+ dependency "ipw_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \
+ no-implicit-rule \
+ clean "ipw_monitor.fwo"
+ipw_monitor.fw optional ipwmonitorfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_monitor.fw"
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
@@ -746,6 +788,48 @@
dev/isp/isp_target.c optional isp
dev/ispfw/ispfw.c optional ispfw
dev/iwi/if_iwi.c optional iwi
+iwibssfw.c optional iwibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwibssfw.c"
+iwi_bss.fwo optional iwibssfw | iwifw \
+ dependency "iwi_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \
+ no-implicit-rule \
+ clean "iwi_bss.fwo"
+iwi_bss.fw optional iwibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_bss.fw"
+iwiibssfw.c optional iwiibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwiibssfw.c"
+iwi_ibss.fwo optional iwiibssfw | iwifw \
+ dependency "iwi_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \
+ no-implicit-rule \
+ clean "iwi_ibss.fwo"
+iwi_ibss.fw optional iwiibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_ibss.fw"
+iwimonitorfw.c optional iwimonitorfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwimonitorfw.c"
+iwi_monitor.fwo optional iwimonitorfw | iwifw \
+ dependency "iwi_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \
+ no-implicit-rule \
+ clean "iwi_monitor.fwo"
+iwi_monitor.fw optional iwimonitorfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_monitor.fw"
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
@@ -922,6 +1006,62 @@
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
dev/ral/if_ral_pci.c optional ral pci
+rt2561fw.c optional rt2561fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561fw.c"
+rt2561fw.fwo optional rt2561fw | ralfw \
+ dependency "rt2561.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
+ no-implicit-rule \
+ clean "rt2561.fwo"
+rt2561.fw optional rt2561fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561.fw"
+rt2561sfw.c optional rt2561sfw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561sfw.c"
+rt2561sfw.fwo optional rt2561sfw | ralfw \
+ dependency "rt2561s.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
+ no-implicit-rule \
+ clean "rt2561s.fwo"
+rt2561s.fw optional rt2561sfw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561s.fw"
+rt2661fw.c optional rt2661fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2661fw.c"
+rt2661fw.fwo optional rt2661fw | ralfw \
+ dependency "rt2661.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
+ no-implicit-rule \
+ clean "rt2661.fwo"
+rt2661.fw optional rt2661fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2661.fw"
+rt2860fw.c optional rt2860fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2860fw.c"
+rt2860fw.fwo optional rt2860fw | ralfw \
+ dependency "rt2860.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
+ no-implicit-rule \
+ clean "rt2860.fwo"
+rt2860.fw optional rt2860fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2860.fw"
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
@@ -1183,6 +1323,20 @@
dev/wi/if_wi_pccard.c optional wi pccard
dev/wi/if_wi_pci.c optional wi pci
dev/wl/if_wl.c optional wl isa
+wpifw.c optional wpifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -lintel_wpi -mwpi -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "wpifw.c"
+wpifw.fwo optional wpifw \
+ dependency "wpi.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} wpi.fw" \
+ no-implicit-rule \
+ clean "wpi.fwo"
+wpi.fw optional wpifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "wpi.fw"
dev/xe/if_xe.c optional xe
dev/xe/if_xe_pccard.c optional xe pccard
fs/coda/coda_fbsd.c optional vcoda
==== //depot/projects/soc2008/diego-audit/src/sys/conf/files.sparc64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.94 2008/02/11 21:40:22 marius Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.95 2008/04/26 11:01:37 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -83,7 +83,6 @@
sparc64/pci/ofw_pcib.c optional pci
sparc64/pci/ofw_pcib_subr.c optional pci
sparc64/pci/ofw_pcibus.c optional pci
-sparc64/pci/ofw_pci_if.m optional pci
sparc64/pci/psycho.c optional pci
sparc64/sbus/dma_sbus.c optional sbus
sparc64/sbus/sbus.c optional sbus
==== //depot/projects/soc2008/diego-audit/src/sys/conf/files.sun4v#2 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sun4v,v 1.13 2007/12/02 20:40:31 rwatson Exp $
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.14 2008/04/26 11:01:37 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -49,7 +49,6 @@
sparc64/pci/ofw_pcib.c optional pci
sparc64/pci/ofw_pcib_subr.c optional pci
sparc64/pci/ofw_pcibus.c optional pci
-sparc64/pci/ofw_pci_if.m optional pci
# XXX hvcons should be optional
sun4v/sun4v/hvcons.c standard
==== //depot/projects/soc2008/diego-audit/src/sys/ddb/db_capture.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5 2008/01/26 23:02:14 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.6 2008/04/25 13:23:36 rwatson Exp $");
#include "opt_ddb.h"
@@ -83,13 +83,16 @@
static SYSCTL_NODE(_debug_ddb, OID_AUTO, capture, CTLFLAG_RW, 0,
"DDB capture options");
-SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bytes, CTLFLAG_RD,
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bufoff, CTLFLAG_RD,
&db_capture_bufoff, 0, "Bytes of data in DDB capture buffer");
SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, maxbufsize, CTLFLAG_RD,
&db_capture_maxbufsize, 0,
"Maximum value for debug.ddb.capture.bufsize");
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
+ &db_capture_inprogress, 0, "DDB output capture in progress");
+
/*
* Boot-time allocation of the DDB capture buffer, if any. Force all buffer
* sizes, including the maximum size, to be rounded to block sizes.
==== //depot/projects/soc2008/diego-audit/src/sys/dev/acpica/acpi_thermal.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.69 2008/02/16 07:15:34 ume Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.70 2008/04/25 16:45:13 rpaulo Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -90,6 +90,7 @@
int tz_temperature; /*Current temperature*/
int tz_active; /*Current active cooling*/
#define TZ_ACTIVE_NONE -1
+#define TZ_ACTIVE_UNKNOWN -2
int tz_requested; /*Minimum active cooling*/
int tz_thflags; /*Current temp-related flags*/
#define TZ_THFLAG_NONE 0
@@ -202,7 +203,7 @@
sc->tz_dev = dev;
sc->tz_handle = acpi_get_handle(dev);
sc->tz_requested = TZ_ACTIVE_NONE;
- sc->tz_active = TZ_ACTIVE_NONE;
+ sc->tz_active = TZ_ACTIVE_UNKNOWN;
sc->tz_thflags = TZ_THFLAG_NONE;
sc->tz_cooling_proc = NULL;
sc->tz_cooling_proc_running = FALSE;
@@ -520,6 +521,7 @@
* minimum cooling run time if requested.
*/
if (acpi_tz_min_runtime > 0 && sc->tz_active != TZ_ACTIVE_NONE &&
+ sc->tz_active != TZ_ACTIVE_UNKNOWN &&
(newactive == TZ_ACTIVE_NONE || newactive > sc->tz_active)) {
getnanotime(&curtime);
@@ -543,6 +545,23 @@
newflags |= TZ_THFLAG_CRT;
/* If the active cooling state has changed, we have to switch things. */
+ if (sc->tz_active == TZ_ACTIVE_UNKNOWN) {
+ /*
+ * We don't know which cooling device is on or off,
+ * so stop them all, because we now know which
+ * should be on (if any).
+ */
+ for (i = 0; i < TZ_NUMLEVELS; i++) {
+ if (sc->tz_zone.al[i].Pointer != NULL) {
+ acpi_ForeachPackageObject(
+ (ACPI_OBJECT *)sc->tz_zone.al[i].Pointer,
+ acpi_tz_switch_cooler_off, sc);
+ }
+ }
+ /* now we know that all devices are off */
+ sc->tz_active = TZ_ACTIVE_NONE;
+ }
+
if (newactive != sc->tz_active) {
/* Turn off the cooling devices that are on, if any are */
if (sc->tz_active != TZ_ACTIVE_NONE)
==== //depot/projects/soc2008/diego-audit/src/sys/dev/bge/if_bge.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.205 2008/04/08 11:51:17 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.206 2008/04/26 10:54:17 marius Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -1894,16 +1894,10 @@
/*
* Allocate the parent bus DMA tag appropriate for PCI.
*/
- error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), /* parent */
- 1, 0, /* alignment, boundary */
- BUS_SPACE_MAXADDR, /* lowaddr */
- BUS_SPACE_MAXADDR, /* highaddr */
- NULL, NULL, /* filter, filterarg */
- MAXBSIZE, BGE_NSEG_NEW, /* maxsize, nsegments */
- BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */
- 0, /* flags */
- NULL, NULL, /* lockfunc, lockarg */
- &sc->bge_cdata.bge_parent_tag);
+ error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev),
+ 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL,
+ NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT,
+ 0, NULL, NULL, &sc->bge_cdata.bge_parent_tag);
if (error != 0) {
device_printf(sc->bge_dev,
@@ -1912,7 +1906,7 @@
}
/*
- * Create tag for RX mbufs.
+ * Create tag for mbufs.
*/
error = bus_dma_tag_create(sc->bge_cdata.bge_parent_tag, 1,
0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL,
@@ -3402,7 +3396,7 @@
error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, map, m, segs,
&nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_defrag(m, M_DONTWAIT);
+ m = m_collapse(m, M_DONTWAIT, BGE_NSEG_NEW);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
==== //depot/projects/soc2008/diego-audit/src/sys/dev/em/e1000_82571.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
/* e1000_82571
* e1000_82572
@@ -150,6 +150,25 @@
goto out;
}
break;
+ case e1000_82574:
+ phy->type = e1000_phy_bm;
+ phy->ops.get_cfg_done = e1000_get_cfg_done_generic;
+ phy->ops.get_info = e1000_get_phy_info_m88;
+ phy->ops.commit = e1000_phy_sw_reset_generic;
+ phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_m88;
+ phy->ops.get_cable_length = e1000_get_cable_length_m88;
+ phy->ops.read_reg = e1000_read_phy_reg_bm2;
+ phy->ops.write_reg = e1000_write_phy_reg_bm2;
+
+ /* This uses above function pointers */
+ ret_val = e1000_get_phy_id_82571(hw);
+ /* Verify PHY ID */
+ if (phy->id != BME1000_E_PHY_ID_R2) {
+ ret_val = -E1000_ERR_PHY;
+ DEBUGOUT1("PHY ID unknown: type = 0x%08x\n", phy->id);
+ goto out;
+ }
+ break;
default:
ret_val = -E1000_ERR_PHY;
goto out;
@@ -193,6 +212,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
if (((eecd >> 15) & 0x3) == 0x3) {
nvm->type = e1000_nvm_flash_hw;
nvm->word_size = 2048;
@@ -374,6 +394,7 @@
{
struct e1000_phy_info *phy = &hw->phy;
s32 ret_val = E1000_SUCCESS;
+ u16 phy_id = 0;
DEBUGFUNC("e1000_get_phy_id_82571");
@@ -391,11 +412,26 @@
case e1000_82573:
ret_val = e1000_get_phy_id(hw);
break;
+ case e1000_82574:
+ ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id = (u32)(phy_id << 16);
+ usec_delay(20);
+ ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id |= (u32)(phy_id);
+ phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
+ break;
default:
ret_val = -E1000_ERR_PHY;
break;
}
+out:
return ret_val;
}
@@ -476,7 +512,7 @@
if (ret_val)
goto out;
- if (hw->mac.type != e1000_82573)
+ if (hw->mac.type != e1000_82573 && hw->mac.type != e1000_82574)
ret_val = e1000_acquire_nvm_generic(hw);
if (ret_val)
@@ -521,6 +557,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
ret_val = e1000_write_nvm_eewr_82571(hw, offset, words, data);
break;
case e1000_82571:
@@ -825,7 +862,7 @@
* Must acquire the MDIO ownership before MAC reset.
* Ownership defaults to firmware after a reset.
*/
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
extcnf_ctrl = E1000_READ_REG(hw, E1000_EXTCNF_CTRL);
extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
@@ -866,7 +903,7 @@
* Need to wait for Phy configuration completion before accessing
* NVM and Phy.
*/
- if (hw->mac.type == e1000_82573)
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574)
msec_delay(25);
/* Clear any pending interrupt events. */
@@ -934,7 +971,7 @@
E1000_WRITE_REG(hw, E1000_TXDCTL(0), reg_data);
/* ...for both queues. */
- if (mac->type != e1000_82573) {
+ if (mac->type != e1000_82573 && mac->type != e1000_82574) {
reg_data = E1000_READ_REG(hw, E1000_TXDCTL(1));
reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
E1000_TXDCTL_FULL_TX_DESC_WB |
@@ -1014,14 +1051,14 @@
}
/* Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL);
reg &= ~(1 << 29);
E1000_WRITE_REG(hw, E1000_CTRL, reg);
}
/* Extended Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
reg &= ~(1 << 23);
reg |= (1 << 22);
@@ -1048,7 +1085,7 @@
DEBUGFUNC("e1000_clear_vfta_82571");
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
if (hw->mng_cookie.vlan_id != 0) {
/*
* The VFTA is a 4096b bit-field, each identifying
@@ -1121,7 +1158,8 @@
* the default flow control setting, so we explicitly
* set it to full.
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 11:51:40 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 35D48106567D; Sat, 26 Apr 2008 11:51:40 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id EB384106566C
for <perforce@freebsd.org>; Sat, 26 Apr 2008 11:51:39 +0000 (UTC)
(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id DD1C28FC20
for <perforce@freebsd.org>; Sat, 26 Apr 2008 11:51:39 +0000 (UTC)
(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QBpdiO056595
for <perforce@freebsd.org>; Sat, 26 Apr 2008 11:51:39 GMT
(envelope-from marius@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QBpdu1056593
for perforce@freebsd.org; Sat, 26 Apr 2008 11:51:39 GMT
(envelope-from marius@freebsd.org)
Date: Sat, 26 Apr 2008 11:51:39 GMT
Message-Id: <200804261151.m3QBpdu1056593@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marius@freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140667 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 11:51:40 -0000
http://perforce.freebsd.org/chv.cgi?CH=140667
Change 140667 by marius@flak on 2008/04/26 11:51:26
IFC @140665 and adjust schizo(4) to the removal of isa_irq_pending().
Affected files ...
.. //depot/projects/usiii/amd64/amd64/machdep.c#7 integrate
.. //depot/projects/usiii/amd64/amd64/pmap.c#6 integrate
.. //depot/projects/usiii/amd64/include/pcpu.h#2 integrate
.. //depot/projects/usiii/arm/arm/machdep.c#3 integrate
.. //depot/projects/usiii/conf/files#10 integrate
.. //depot/projects/usiii/conf/files.sparc64#5 integrate
.. //depot/projects/usiii/conf/files.sun4v#3 integrate
.. //depot/projects/usiii/ddb/db_capture.c#2 integrate
.. //depot/projects/usiii/dev/acpica/acpi_thermal.c#5 integrate
.. //depot/projects/usiii/dev/bge/if_bge.c#9 integrate
.. //depot/projects/usiii/dev/em/e1000_82571.c#5 integrate
.. //depot/projects/usiii/dev/em/e1000_82571.h#5 integrate
.. //depot/projects/usiii/dev/em/e1000_api.c#5 integrate
.. //depot/projects/usiii/dev/em/e1000_api.h#5 integrate
.. //depot/projects/usiii/dev/em/e1000_defines.h#5 integrate
.. //depot/projects/usiii/dev/em/e1000_hw.h#5 integrate
.. //depot/projects/usiii/dev/em/e1000_ich8lan.c#5 integrate
.. //depot/projects/usiii/dev/em/e1000_ich8lan.h#5 integrate
.. //depot/projects/usiii/dev/em/e1000_osdep.h#5 integrate
.. //depot/projects/usiii/dev/em/e1000_phy.c#5 integrate
.. //depot/projects/usiii/dev/em/e1000_phy.h#5 integrate
.. //depot/projects/usiii/dev/em/if_em.c#6 integrate
.. //depot/projects/usiii/dev/em/if_em.h#6 integrate
.. //depot/projects/usiii/dev/hme/if_hme.c#2 integrate
.. //depot/projects/usiii/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/usiii/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/usiii/dev/hme/if_hmereg.h#2 integrate
.. //depot/projects/usiii/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_82575.c#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_api.c#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_api.h#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_defines.h#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_hw.h#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_mac.c#3 integrate
.. //depot/projects/usiii/dev/igb/e1000_manage.h#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_osdep.c#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_osdep.h#2 integrate
.. //depot/projects/usiii/dev/igb/e1000_phy.c#2 integrate
.. //depot/projects/usiii/dev/igb/if_igb.c#4 integrate
.. //depot/projects/usiii/dev/igb/if_igb.h#2 integrate
.. //depot/projects/usiii/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/usiii/dev/usb/if_rum.c#8 integrate
.. //depot/projects/usiii/dev/usb/if_udav.c#3 integrate
.. //depot/projects/usiii/dev/usb/usbdevs#9 integrate
.. //depot/projects/usiii/dev/vx/if_vx.c#2 integrate
.. //depot/projects/usiii/fs/unionfs/union.h#3 integrate
.. //depot/projects/usiii/fs/unionfs/union_subr.c#5 integrate
.. //depot/projects/usiii/fs/unionfs/union_vnops.c#5 integrate
.. //depot/projects/usiii/geom/part/g_part.c#4 integrate
.. //depot/projects/usiii/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/usiii/geom/part/g_part_bsd.c#4 integrate
.. //depot/projects/usiii/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/usiii/geom/part/g_part_mbr.c#4 integrate
.. //depot/projects/usiii/geom/part/g_part_pc98.c#2 integrate
.. //depot/projects/usiii/geom/part/g_part_vtoc8.c#3 integrate
.. //depot/projects/usiii/i386/i386/machdep.c#6 integrate
.. //depot/projects/usiii/i386/i386/pmap.c#5 integrate
.. //depot/projects/usiii/i386/include/pcpu.h#2 integrate
.. //depot/projects/usiii/ia64/ia64/machdep.c#8 integrate
.. //depot/projects/usiii/kern/kern_descrip.c#7 integrate
.. //depot/projects/usiii/kern/sched_4bsd.c#8 integrate
.. //depot/projects/usiii/kern/sched_ule.c#9 integrate
.. //depot/projects/usiii/kern/vfs_subr.c#8 integrate
.. //depot/projects/usiii/mips/mips/machdep.c#2 integrate
.. //depot/projects/usiii/modules/em/Makefile#4 integrate
.. //depot/projects/usiii/net/radix_mpath.c#2 integrate
.. //depot/projects/usiii/net80211/ieee80211.c#5 integrate
.. //depot/projects/usiii/pc98/pc98/machdep.c#8 integrate
.. //depot/projects/usiii/powerpc/aim/machdep.c#6 integrate
.. //depot/projects/usiii/powerpc/booke/machdep.c#4 integrate
.. //depot/projects/usiii/security/audit/audit.h#3 integrate
.. //depot/projects/usiii/sparc64/include/sysarch.h#2 integrate
.. //depot/projects/usiii/sparc64/isa/isa.c#3 integrate
.. //depot/projects/usiii/sparc64/pci/ofw_pci.h#2 integrate
.. //depot/projects/usiii/sparc64/pci/ofw_pci_if.m#3 delete
.. //depot/projects/usiii/sparc64/pci/psycho.c#9 integrate
.. //depot/projects/usiii/sparc64/pci/schizo.c#6 edit
.. //depot/projects/usiii/sparc64/sparc64/machdep.c#4 integrate
.. //depot/projects/usiii/sun4v/sun4v/hv_pci.c#3 integrate
.. //depot/projects/usiii/sun4v/sun4v/machdep.c#4 integrate
.. //depot/projects/usiii/sys/proc.h#9 integrate
Differences ...
==== //depot/projects/usiii/amd64/amd64/machdep.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.686 2008/04/25 05:18:47 jeff Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -53,6 +53,7 @@
#include "opt_maxmem.h"
#include "opt_msgbuf.h"
#include "opt_perfmon.h"
+#include "opt_sched.h"
#include <sys/param.h>
#include <sys/proc.h>
@@ -527,62 +528,192 @@
__asm__ ("hlt");
}
+void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */
+
+static void
+cpu_idle_hlt(int busy)
+{
+ /*
+ * we must absolutely guarentee that hlt is the next instruction
+ * after sti or we introduce a timing window.
+ */
+ disable_intr();
+ if (sched_runnable())
+ enable_intr();
+ else
+ __asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_acpi(int busy)
+{
+ disable_intr();
+ if (sched_runnable())
+ enable_intr();
+ else if (cpu_idle_hook)
+ cpu_idle_hook();
+ else
+ __asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_spin(int busy)
+{
+ return;
+}
+
+void (*cpu_idle_fn)(int) = cpu_idle_acpi;
+
+void
+cpu_idle(int busy)
+{
+#ifdef SMP
+ if (mp_grab_cpu_hlt())
+ return;
+#endif
+ cpu_idle_fn(busy);
+}
+
/*
- * Hook to idle the CPU when possible. In the SMP case we default to
- * off because a halted cpu will not currently pick up a new thread in the
- * run queue until the next timer tick. If turned on this will result in
- * approximately a 4.2% loss in real time performance in buildworld tests
- * (but improves user and sys times oddly enough), and saves approximately
- * 5% in power consumption on an idle machine (tests w/2xCPU 1.1GHz P3).
- *
- * XXX we need to have a cpu mask of idle cpus and generate an IPI or
- * otherwise generate some sort of interrupt to wake up cpus sitting in HLT.
- * Then we can have our cake and eat it too.
- *
- * XXX I'm turning it on for SMP as well by default for now. It seems to
- * help lock contention somewhat, and this is critical for HTT. -Peter
+ * mwait cpu power states. Lower 4 bits are sub-states.
*/
-static int cpu_idle_hlt = 1;
-TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt);
-SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
- &cpu_idle_hlt, 0, "Idle loop HLT enable");
+#define MWAIT_C0 0xf0
+#define MWAIT_C1 0x00
+#define MWAIT_C2 0x10
+#define MWAIT_C3 0x20
+#define MWAIT_C4 0x30
+
+#define MWAIT_DISABLED 0x0
+#define MWAIT_WOKEN 0x1
+#define MWAIT_WAITING 0x2
+
+static void
+cpu_idle_mwait(int busy)
+{
+ int *mwait;
+
+ mwait = (int *)PCPU_PTR(monitorbuf);
+ *mwait = MWAIT_WAITING;
+ if (sched_runnable())
+ return;
+ cpu_monitor(mwait, 0, 0);
+ if (*mwait == MWAIT_WAITING)
+ cpu_mwait(0, MWAIT_C1);
+}
static void
-cpu_idle_default(void)
+cpu_idle_mwait_hlt(int busy)
+{
+ int *mwait;
+
+ mwait = (int *)PCPU_PTR(monitorbuf);
+ if (busy == 0) {
+ *mwait = MWAIT_DISABLED;
+ cpu_idle_hlt(busy);
+ return;
+ }
+ *mwait = MWAIT_WAITING;
+ if (sched_runnable())
+ return;
+ cpu_monitor(mwait, 0, 0);
+ if (*mwait == MWAIT_WAITING)
+ cpu_mwait(0, MWAIT_C1);
+}
+
+int
+cpu_idle_wakeup(int cpu)
{
+ struct pcpu *pcpu;
+ int *mwait;
+
+ if (cpu_idle_fn == cpu_idle_spin)
+ return (1);
+ if (cpu_idle_fn != cpu_idle_mwait && cpu_idle_fn != cpu_idle_mwait_hlt)
+ return (0);
+ pcpu = pcpu_find(cpu);
+ mwait = (int *)pcpu->pc_monitorbuf;
/*
- * we must absolutely guarentee that hlt is the
- * absolute next instruction after sti or we
- * introduce a timing window.
+ * This doesn't need to be atomic since missing the race will
+ * simply result in unnecessary IPIs.
*/
- __asm __volatile("sti; hlt");
+ if (cpu_idle_fn == cpu_idle_mwait_hlt && *mwait == MWAIT_DISABLED)
+ return (0);
+ *mwait = MWAIT_WOKEN;
+
+ return (1);
}
/*
- * Note that we have to be careful here to avoid a race between checking
- * sched_runnable() and actually halting. If we don't do this, we may waste
- * the time between calling hlt and the next interrupt even though there
- * is a runnable process.
+ * Ordered by speed/power consumption.
*/
-void
-cpu_idle(void)
+struct {
+ void *id_fn;
+ char *id_name;
+} idle_tbl[] = {
+ { cpu_idle_spin, "spin" },
+ { cpu_idle_mwait, "mwait" },
+ { cpu_idle_mwait_hlt, "mwait_hlt" },
+ { cpu_idle_hlt, "hlt" },
+ { cpu_idle_acpi, "acpi" },
+ { NULL, NULL }
+};
+
+static int
+idle_sysctl_available(SYSCTL_HANDLER_ARGS)
+{
+ char *avail, *p;
+ int error;
+ int i;
+
+ avail = malloc(256, M_TEMP, M_WAITOK);
+ p = avail;
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (strstr(idle_tbl[i].id_name, "mwait") &&
+ (cpu_feature2 & CPUID2_MON) == 0)
+ continue;
+ p += sprintf(p, "%s, ", idle_tbl[i].id_name);
+ }
+ error = sysctl_handle_string(oidp, avail, 0, req);
+ free(avail, M_TEMP);
+ return (error);
+}
+
+static int
+idle_sysctl(SYSCTL_HANDLER_ARGS)
{
+ char buf[16];
+ int error;
+ char *p;
+ int i;
-#ifdef SMP
- if (mp_grab_cpu_hlt())
- return;
-#endif
- if (cpu_idle_hlt) {
- disable_intr();
- if (sched_runnable())
- enable_intr();
- else
- (*cpu_idle_hook)();
+ p = "unknown";
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (idle_tbl[i].id_fn == cpu_idle_fn) {
+ p = idle_tbl[i].id_name;
+ break;
+ }
+ }
+ strncpy(buf, p, sizeof(buf));
+ error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
+ if (error != 0 || req->newptr == NULL)
+ return (error);
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (strstr(idle_tbl[i].id_name, "mwait") &&
+ (cpu_feature2 & CPUID2_MON) == 0)
+ continue;
+ if (strcmp(idle_tbl[i].id_name, buf))
+ continue;
+ cpu_idle_fn = idle_tbl[i].id_fn;
+ return (0);
}
+ return (EINVAL);
}
-/* Other subsystems (e.g., ACPI) can hook this later. */
-void (*cpu_idle_hook)(void) = cpu_idle_default;
+SYSCTL_PROC(_machdep, OID_AUTO, idle_available, CTLTYPE_STRING | CTLFLAG_RD,
+ 0, 0, idle_sysctl_available, "A", "list of available idle functions");
+
+SYSCTL_PROC(_machdep, OID_AUTO, idle, CTLTYPE_STRING | CTLFLAG_RW, 0, 0,
+ idle_sysctl, "A", "currently selected idle function");
/*
* Clear registers on exec
==== //depot/projects/usiii/amd64/amd64/pmap.c#6 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.614 2008/04/10 16:04:50 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $");
/*
* Manages physical address maps.
@@ -2266,7 +2266,7 @@
* the 2mpage to referencing the page table page.
*/
if ((oldpde & PG_MANAGED) != 0)
- pmap_pv_demote_pde(pmap, va, oldpde & PG_FRAME);
+ pmap_pv_demote_pde(pmap, va, oldpde & PG_PS_FRAME);
pmap_pde_demotions++;
CTR2(KTR_PMAP, "pmap_demote_pde: success for va %#lx"
@@ -2301,10 +2301,10 @@
pmap_invalidate_page(kernel_pmap, sva);
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
if (oldpde & PG_MANAGED) {
- pvh = pa_to_pvh(oldpde & PG_FRAME);
+ pvh = pa_to_pvh(oldpde & PG_PS_FRAME);
pmap_pvh_free(pvh, pmap, sva);
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
vm_page_dirty(m);
@@ -2600,7 +2600,7 @@
oldpde = newpde = *pde;
if (oldpde & PG_MANAGED) {
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
/*
* In contrast to the analogous operation on a 4KB page
@@ -2839,7 +2839,7 @@
* Promote the pv entries.
*/
if ((newpde & PG_MANAGED) != 0)
- pmap_pv_promote_pde(pmap, va, newpde & PG_FRAME);
+ pmap_pv_promote_pde(pmap, va, newpde & PG_PS_FRAME);
/*
* Propagate the PAT index to its proper position.
@@ -3820,7 +3820,7 @@
pc->pc_map[field] |= bitmask;
if ((tpte & PG_PS) != 0) {
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
- pvh = pa_to_pvh(tpte & PG_FRAME);
+ pvh = pa_to_pvh(tpte & PG_PS_FRAME);
TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
if (TAILQ_EMPTY(&pvh->pv_list)) {
for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
@@ -4029,7 +4029,7 @@
* table page.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
rtval++;
if (rtval > 4) {
@@ -4098,7 +4098,7 @@
* write access may repromote.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pte = pmap_pde_to_pte(pde, va);
oldpte = *pte;
if ((oldpte & PG_V) != 0) {
@@ -4163,7 +4163,8 @@
* fully populated, this removal never frees
* a page table page.
*/
- va += VM_PAGE_TO_PHYS(m) - (oldpde & PG_FRAME);
+ va += VM_PAGE_TO_PHYS(m) - (oldpde &
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
}
}
==== //depot/projects/usiii/amd64/include/pcpu.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.48 2007/06/04 21:38:45 attilio Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.49 2008/04/25 05:18:48 jeff Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -43,6 +43,7 @@
* other processors"
*/
#define PCPU_MD_FIELDS \
+ char pc_monitorbuf[128] __aligned(128); /* cache line */ \
struct pcpu *pc_prvspace; /* Self-reference */ \
struct pmap *pc_curpmap; \
struct amd64tss *pc_tssp; \
==== //depot/projects/usiii/arm/arm/machdep.c#3 (text+ko) ====
@@ -46,7 +46,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.31 2008/04/25 05:18:48 jeff Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -326,12 +326,19 @@
}
void
-cpu_idle(void)
+cpu_idle(int busy)
{
cpu_sleep(0);
}
int
+cpu_idle_wakeup(int cpu)
+{
+
+ return (0);
+}
+
+int
fill_regs(struct thread *td, struct reg *regs)
{
struct trapframe *tf = td->td_frame;
==== //depot/projects/usiii/conf/files#10 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -732,6 +732,48 @@
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
+ipwbssfw.c optional ipwbssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwbssfw.c"
+ipw_bss.fwo optional ipwbssfw | ipwfw \
+ dependency "ipw_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \
+ no-implicit-rule \
+ clean "ipw_bss.fwo"
+ipw_bss.fw optional ipwbssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_bss.fw"
+ipwibssfw.c optional ipwibssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwibssfw.c"
+ipw_ibss.fwo optional ipwibssfw | ipwfw \
+ dependency "ipw_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \
+ no-implicit-rule \
+ clean "ipw_ibss.fwo"
+ipw_ibss.fw optional ipwibssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_ibss.fw"
+ipwmonitorfw.c optional ipwmonitorfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwmonitorfw.c"
+ipw_monitor.fwo optional ipwmonitorfw | ipwfw \
+ dependency "ipw_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \
+ no-implicit-rule \
+ clean "ipw_monitor.fwo"
+ipw_monitor.fw optional ipwmonitorfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_monitor.fw"
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
@@ -746,6 +788,48 @@
dev/isp/isp_target.c optional isp
dev/ispfw/ispfw.c optional ispfw
dev/iwi/if_iwi.c optional iwi
+iwibssfw.c optional iwibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwibssfw.c"
+iwi_bss.fwo optional iwibssfw | iwifw \
+ dependency "iwi_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \
+ no-implicit-rule \
+ clean "iwi_bss.fwo"
+iwi_bss.fw optional iwibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_bss.fw"
+iwiibssfw.c optional iwiibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwiibssfw.c"
+iwi_ibss.fwo optional iwiibssfw | iwifw \
+ dependency "iwi_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \
+ no-implicit-rule \
+ clean "iwi_ibss.fwo"
+iwi_ibss.fw optional iwiibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_ibss.fw"
+iwimonitorfw.c optional iwimonitorfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwimonitorfw.c"
+iwi_monitor.fwo optional iwimonitorfw | iwifw \
+ dependency "iwi_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \
+ no-implicit-rule \
+ clean "iwi_monitor.fwo"
+iwi_monitor.fw optional iwimonitorfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_monitor.fw"
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
@@ -922,6 +1006,62 @@
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
dev/ral/if_ral_pci.c optional ral pci
+rt2561fw.c optional rt2561fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561fw.c"
+rt2561fw.fwo optional rt2561fw | ralfw \
+ dependency "rt2561.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
+ no-implicit-rule \
+ clean "rt2561.fwo"
+rt2561.fw optional rt2561fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561.fw"
+rt2561sfw.c optional rt2561sfw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561sfw.c"
+rt2561sfw.fwo optional rt2561sfw | ralfw \
+ dependency "rt2561s.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
+ no-implicit-rule \
+ clean "rt2561s.fwo"
+rt2561s.fw optional rt2561sfw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561s.fw"
+rt2661fw.c optional rt2661fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2661fw.c"
+rt2661fw.fwo optional rt2661fw | ralfw \
+ dependency "rt2661.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
+ no-implicit-rule \
+ clean "rt2661.fwo"
+rt2661.fw optional rt2661fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2661.fw"
+rt2860fw.c optional rt2860fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2860fw.c"
+rt2860fw.fwo optional rt2860fw | ralfw \
+ dependency "rt2860.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
+ no-implicit-rule \
+ clean "rt2860.fwo"
+rt2860.fw optional rt2860fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2860.fw"
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
@@ -1183,6 +1323,20 @@
dev/wi/if_wi_pccard.c optional wi pccard
dev/wi/if_wi_pci.c optional wi pci
dev/wl/if_wl.c optional wl isa
+wpifw.c optional wpifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -lintel_wpi -mwpi -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "wpifw.c"
+wpifw.fwo optional wpifw \
+ dependency "wpi.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} wpi.fw" \
+ no-implicit-rule \
+ clean "wpi.fwo"
+wpi.fw optional wpifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "wpi.fw"
dev/xe/if_xe.c optional xe
dev/xe/if_xe_pccard.c optional xe pccard
fs/coda/coda_fbsd.c optional vcoda
==== //depot/projects/usiii/conf/files.sparc64#5 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.94 2008/02/11 21:40:22 marius Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.95 2008/04/26 11:01:37 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -83,7 +83,6 @@
sparc64/pci/ofw_pcib.c optional pci
sparc64/pci/ofw_pcib_subr.c optional pci
sparc64/pci/ofw_pcibus.c optional pci
-sparc64/pci/ofw_pci_if.m optional pci
sparc64/pci/psycho.c optional pci
sparc64/pci/schizo.c optional pci
sparc64/sbus/dma_sbus.c optional sbus
==== //depot/projects/usiii/conf/files.sun4v#3 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sun4v,v 1.13 2007/12/02 20:40:31 rwatson Exp $
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.14 2008/04/26 11:01:37 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -49,7 +49,6 @@
sparc64/pci/ofw_pcib.c optional pci
sparc64/pci/ofw_pcib_subr.c optional pci
sparc64/pci/ofw_pcibus.c optional pci
-sparc64/pci/ofw_pci_if.m optional pci
# XXX hvcons should be optional
sun4v/sun4v/hvcons.c standard
==== //depot/projects/usiii/ddb/db_capture.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5 2008/01/26 23:02:14 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.6 2008/04/25 13:23:36 rwatson Exp $");
#include "opt_ddb.h"
@@ -83,13 +83,16 @@
static SYSCTL_NODE(_debug_ddb, OID_AUTO, capture, CTLFLAG_RW, 0,
"DDB capture options");
-SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bytes, CTLFLAG_RD,
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bufoff, CTLFLAG_RD,
&db_capture_bufoff, 0, "Bytes of data in DDB capture buffer");
SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, maxbufsize, CTLFLAG_RD,
&db_capture_maxbufsize, 0,
"Maximum value for debug.ddb.capture.bufsize");
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
+ &db_capture_inprogress, 0, "DDB output capture in progress");
+
/*
* Boot-time allocation of the DDB capture buffer, if any. Force all buffer
* sizes, including the maximum size, to be rounded to block sizes.
==== //depot/projects/usiii/dev/acpica/acpi_thermal.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.69 2008/02/16 07:15:34 ume Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.70 2008/04/25 16:45:13 rpaulo Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -90,6 +90,7 @@
int tz_temperature; /*Current temperature*/
int tz_active; /*Current active cooling*/
#define TZ_ACTIVE_NONE -1
+#define TZ_ACTIVE_UNKNOWN -2
int tz_requested; /*Minimum active cooling*/
int tz_thflags; /*Current temp-related flags*/
#define TZ_THFLAG_NONE 0
@@ -202,7 +203,7 @@
sc->tz_dev = dev;
sc->tz_handle = acpi_get_handle(dev);
sc->tz_requested = TZ_ACTIVE_NONE;
- sc->tz_active = TZ_ACTIVE_NONE;
+ sc->tz_active = TZ_ACTIVE_UNKNOWN;
sc->tz_thflags = TZ_THFLAG_NONE;
sc->tz_cooling_proc = NULL;
sc->tz_cooling_proc_running = FALSE;
@@ -520,6 +521,7 @@
* minimum cooling run time if requested.
*/
if (acpi_tz_min_runtime > 0 && sc->tz_active != TZ_ACTIVE_NONE &&
+ sc->tz_active != TZ_ACTIVE_UNKNOWN &&
(newactive == TZ_ACTIVE_NONE || newactive > sc->tz_active)) {
getnanotime(&curtime);
@@ -543,6 +545,23 @@
newflags |= TZ_THFLAG_CRT;
/* If the active cooling state has changed, we have to switch things. */
+ if (sc->tz_active == TZ_ACTIVE_UNKNOWN) {
+ /*
+ * We don't know which cooling device is on or off,
+ * so stop them all, because we now know which
+ * should be on (if any).
+ */
+ for (i = 0; i < TZ_NUMLEVELS; i++) {
+ if (sc->tz_zone.al[i].Pointer != NULL) {
+ acpi_ForeachPackageObject(
+ (ACPI_OBJECT *)sc->tz_zone.al[i].Pointer,
+ acpi_tz_switch_cooler_off, sc);
+ }
+ }
+ /* now we know that all devices are off */
+ sc->tz_active = TZ_ACTIVE_NONE;
+ }
+
if (newactive != sc->tz_active) {
/* Turn off the cooling devices that are on, if any are */
if (sc->tz_active != TZ_ACTIVE_NONE)
==== //depot/projects/usiii/dev/bge/if_bge.c#9 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.205 2008/04/08 11:51:17 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.206 2008/04/26 10:54:17 marius Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -1894,16 +1894,10 @@
/*
* Allocate the parent bus DMA tag appropriate for PCI.
*/
- error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), /* parent */
- 1, 0, /* alignment, boundary */
- BUS_SPACE_MAXADDR, /* lowaddr */
- BUS_SPACE_MAXADDR, /* highaddr */
- NULL, NULL, /* filter, filterarg */
- MAXBSIZE, BGE_NSEG_NEW, /* maxsize, nsegments */
- BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */
- 0, /* flags */
- NULL, NULL, /* lockfunc, lockarg */
- &sc->bge_cdata.bge_parent_tag);
+ error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev),
+ 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL,
+ NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT,
+ 0, NULL, NULL, &sc->bge_cdata.bge_parent_tag);
if (error != 0) {
device_printf(sc->bge_dev,
@@ -1912,7 +1906,7 @@
}
/*
- * Create tag for RX mbufs.
+ * Create tag for mbufs.
*/
error = bus_dma_tag_create(sc->bge_cdata.bge_parent_tag, 1,
0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL,
@@ -3402,7 +3396,7 @@
error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, map, m, segs,
&nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_defrag(m, M_DONTWAIT);
+ m = m_collapse(m, M_DONTWAIT, BGE_NSEG_NEW);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
==== //depot/projects/usiii/dev/em/e1000_82571.c#5 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
/* e1000_82571
* e1000_82572
@@ -150,6 +150,25 @@
goto out;
}
break;
+ case e1000_82574:
+ phy->type = e1000_phy_bm;
+ phy->ops.get_cfg_done = e1000_get_cfg_done_generic;
+ phy->ops.get_info = e1000_get_phy_info_m88;
+ phy->ops.commit = e1000_phy_sw_reset_generic;
+ phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_m88;
+ phy->ops.get_cable_length = e1000_get_cable_length_m88;
+ phy->ops.read_reg = e1000_read_phy_reg_bm2;
+ phy->ops.write_reg = e1000_write_phy_reg_bm2;
+
+ /* This uses above function pointers */
+ ret_val = e1000_get_phy_id_82571(hw);
+ /* Verify PHY ID */
+ if (phy->id != BME1000_E_PHY_ID_R2) {
+ ret_val = -E1000_ERR_PHY;
+ DEBUGOUT1("PHY ID unknown: type = 0x%08x\n", phy->id);
+ goto out;
+ }
+ break;
default:
ret_val = -E1000_ERR_PHY;
goto out;
@@ -193,6 +212,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
if (((eecd >> 15) & 0x3) == 0x3) {
nvm->type = e1000_nvm_flash_hw;
nvm->word_size = 2048;
@@ -374,6 +394,7 @@
{
struct e1000_phy_info *phy = &hw->phy;
s32 ret_val = E1000_SUCCESS;
+ u16 phy_id = 0;
DEBUGFUNC("e1000_get_phy_id_82571");
@@ -391,11 +412,26 @@
case e1000_82573:
ret_val = e1000_get_phy_id(hw);
break;
+ case e1000_82574:
+ ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id = (u32)(phy_id << 16);
+ usec_delay(20);
+ ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id |= (u32)(phy_id);
+ phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
+ break;
default:
ret_val = -E1000_ERR_PHY;
break;
}
+out:
return ret_val;
}
@@ -476,7 +512,7 @@
if (ret_val)
goto out;
- if (hw->mac.type != e1000_82573)
+ if (hw->mac.type != e1000_82573 && hw->mac.type != e1000_82574)
ret_val = e1000_acquire_nvm_generic(hw);
if (ret_val)
@@ -521,6 +557,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
ret_val = e1000_write_nvm_eewr_82571(hw, offset, words, data);
break;
case e1000_82571:
@@ -825,7 +862,7 @@
* Must acquire the MDIO ownership before MAC reset.
* Ownership defaults to firmware after a reset.
*/
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
extcnf_ctrl = E1000_READ_REG(hw, E1000_EXTCNF_CTRL);
extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
@@ -866,7 +903,7 @@
* Need to wait for Phy configuration completion before accessing
* NVM and Phy.
*/
- if (hw->mac.type == e1000_82573)
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574)
msec_delay(25);
/* Clear any pending interrupt events. */
@@ -934,7 +971,7 @@
E1000_WRITE_REG(hw, E1000_TXDCTL(0), reg_data);
/* ...for both queues. */
- if (mac->type != e1000_82573) {
+ if (mac->type != e1000_82573 && mac->type != e1000_82574) {
reg_data = E1000_READ_REG(hw, E1000_TXDCTL(1));
reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
E1000_TXDCTL_FULL_TX_DESC_WB |
@@ -1014,14 +1051,14 @@
}
/* Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL);
reg &= ~(1 << 29);
E1000_WRITE_REG(hw, E1000_CTRL, reg);
}
/* Extended Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
reg &= ~(1 << 23);
reg |= (1 << 22);
@@ -1048,7 +1085,7 @@
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 13:55:59 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id CCED0106567D; Sat, 26 Apr 2008 13:55:58 +0000 (UTC)
Delivered-To: perforce@FreeBSD.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 5D64B106567B
for <perforce@FreeBSD.org>; Sat, 26 Apr 2008 13:55:58 +0000 (UTC)
(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 4E81E8FC1B
for <perforce@FreeBSD.org>; Sat, 26 Apr 2008 13:55:58 +0000 (UTC)
(envelope-from snagg@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QDtwJD089139
for <perforce@FreeBSD.org>; Sat, 26 Apr 2008 13:55:58 GMT
(envelope-from snagg@FreeBSD.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QDtvXO089136
for perforce@freebsd.org; Sat, 26 Apr 2008 13:55:57 GMT
(envelope-from snagg@FreeBSD.org)
Date: Sat, 26 Apr 2008 13:55:57 GMT
Message-Id: <200804261355.m3QDtvXO089136@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
snagg@FreeBSD.org using -f
From: Vincenzo Iozzo <snagg@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc:
Subject: PERFORCE change 140675 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 13:55:59 -0000
http://perforce.freebsd.org/chv.cgi?CH=140675
Change 140675 by snagg@snagg_macosx on 2008/04/26 13:55:00
IFC
Affected files ...
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/pmap.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/amd64/include/pcpu.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/arm/arm/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/files#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/files.sparc64#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/conf/files.sun4v#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/ddb/db_capture.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/acpica/acpi_thermal.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/bge/if_bge.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82571.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82571.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_api.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_api.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_defines.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_hw.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_ich8lan.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_ich8lan.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_osdep.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_phy.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_phy.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/if_em.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/em/if_em.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/hme/if_hmereg.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/hme/if_hmevar.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_82575.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_api.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_api.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_defines.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_hw.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_mac.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_manage.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_osdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_osdep.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/e1000_phy.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/if_igb.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/igb/if_igb.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/if_rum.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/if_udav.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/dev/vx/if_vx.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/fs/unionfs/union.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/fs/unionfs/union_subr.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/fs/unionfs/union_vnops.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/i386/i386/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/i386/i386/pmap.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/i386/include/pcpu.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/kern_descrip.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/sched_4bsd.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/mips/mips/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/modules/em/Makefile#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/pc98/pc98/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/aim/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/powerpc/booke/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/pci/ofw_pci.h#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/pci/ofw_pci_if.m#2 delete
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/pci/psycho.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sparc64/sparc64/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sun4v/sun4v/hv_pci.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sun4v/sun4v/machdep.c#2 integrate
.. //depot/projects/soc2008/snagg-audit/sys/sys/proc.h#2 integrate
Differences ...
==== //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/machdep.c#2 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.685 2008/04/22 19:38:26 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.686 2008/04/25 05:18:47 jeff Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -53,6 +53,7 @@
#include "opt_maxmem.h"
#include "opt_msgbuf.h"
#include "opt_perfmon.h"
+#include "opt_sched.h"
#include <sys/param.h>
#include <sys/proc.h>
@@ -527,62 +528,192 @@
__asm__ ("hlt");
}
+void (*cpu_idle_hook)(void) = NULL; /* ACPI idle hook. */
+
+static void
+cpu_idle_hlt(int busy)
+{
+ /*
+ * we must absolutely guarentee that hlt is the next instruction
+ * after sti or we introduce a timing window.
+ */
+ disable_intr();
+ if (sched_runnable())
+ enable_intr();
+ else
+ __asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_acpi(int busy)
+{
+ disable_intr();
+ if (sched_runnable())
+ enable_intr();
+ else if (cpu_idle_hook)
+ cpu_idle_hook();
+ else
+ __asm __volatile("sti; hlt");
+}
+
+static void
+cpu_idle_spin(int busy)
+{
+ return;
+}
+
+void (*cpu_idle_fn)(int) = cpu_idle_acpi;
+
+void
+cpu_idle(int busy)
+{
+#ifdef SMP
+ if (mp_grab_cpu_hlt())
+ return;
+#endif
+ cpu_idle_fn(busy);
+}
+
/*
- * Hook to idle the CPU when possible. In the SMP case we default to
- * off because a halted cpu will not currently pick up a new thread in the
- * run queue until the next timer tick. If turned on this will result in
- * approximately a 4.2% loss in real time performance in buildworld tests
- * (but improves user and sys times oddly enough), and saves approximately
- * 5% in power consumption on an idle machine (tests w/2xCPU 1.1GHz P3).
- *
- * XXX we need to have a cpu mask of idle cpus and generate an IPI or
- * otherwise generate some sort of interrupt to wake up cpus sitting in HLT.
- * Then we can have our cake and eat it too.
- *
- * XXX I'm turning it on for SMP as well by default for now. It seems to
- * help lock contention somewhat, and this is critical for HTT. -Peter
+ * mwait cpu power states. Lower 4 bits are sub-states.
*/
-static int cpu_idle_hlt = 1;
-TUNABLE_INT("machdep.cpu_idle_hlt", &cpu_idle_hlt);
-SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW,
- &cpu_idle_hlt, 0, "Idle loop HLT enable");
+#define MWAIT_C0 0xf0
+#define MWAIT_C1 0x00
+#define MWAIT_C2 0x10
+#define MWAIT_C3 0x20
+#define MWAIT_C4 0x30
+
+#define MWAIT_DISABLED 0x0
+#define MWAIT_WOKEN 0x1
+#define MWAIT_WAITING 0x2
+
+static void
+cpu_idle_mwait(int busy)
+{
+ int *mwait;
+
+ mwait = (int *)PCPU_PTR(monitorbuf);
+ *mwait = MWAIT_WAITING;
+ if (sched_runnable())
+ return;
+ cpu_monitor(mwait, 0, 0);
+ if (*mwait == MWAIT_WAITING)
+ cpu_mwait(0, MWAIT_C1);
+}
static void
-cpu_idle_default(void)
+cpu_idle_mwait_hlt(int busy)
+{
+ int *mwait;
+
+ mwait = (int *)PCPU_PTR(monitorbuf);
+ if (busy == 0) {
+ *mwait = MWAIT_DISABLED;
+ cpu_idle_hlt(busy);
+ return;
+ }
+ *mwait = MWAIT_WAITING;
+ if (sched_runnable())
+ return;
+ cpu_monitor(mwait, 0, 0);
+ if (*mwait == MWAIT_WAITING)
+ cpu_mwait(0, MWAIT_C1);
+}
+
+int
+cpu_idle_wakeup(int cpu)
{
+ struct pcpu *pcpu;
+ int *mwait;
+
+ if (cpu_idle_fn == cpu_idle_spin)
+ return (1);
+ if (cpu_idle_fn != cpu_idle_mwait && cpu_idle_fn != cpu_idle_mwait_hlt)
+ return (0);
+ pcpu = pcpu_find(cpu);
+ mwait = (int *)pcpu->pc_monitorbuf;
/*
- * we must absolutely guarentee that hlt is the
- * absolute next instruction after sti or we
- * introduce a timing window.
+ * This doesn't need to be atomic since missing the race will
+ * simply result in unnecessary IPIs.
*/
- __asm __volatile("sti; hlt");
+ if (cpu_idle_fn == cpu_idle_mwait_hlt && *mwait == MWAIT_DISABLED)
+ return (0);
+ *mwait = MWAIT_WOKEN;
+
+ return (1);
}
/*
- * Note that we have to be careful here to avoid a race between checking
- * sched_runnable() and actually halting. If we don't do this, we may waste
- * the time between calling hlt and the next interrupt even though there
- * is a runnable process.
+ * Ordered by speed/power consumption.
*/
-void
-cpu_idle(void)
+struct {
+ void *id_fn;
+ char *id_name;
+} idle_tbl[] = {
+ { cpu_idle_spin, "spin" },
+ { cpu_idle_mwait, "mwait" },
+ { cpu_idle_mwait_hlt, "mwait_hlt" },
+ { cpu_idle_hlt, "hlt" },
+ { cpu_idle_acpi, "acpi" },
+ { NULL, NULL }
+};
+
+static int
+idle_sysctl_available(SYSCTL_HANDLER_ARGS)
+{
+ char *avail, *p;
+ int error;
+ int i;
+
+ avail = malloc(256, M_TEMP, M_WAITOK);
+ p = avail;
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (strstr(idle_tbl[i].id_name, "mwait") &&
+ (cpu_feature2 & CPUID2_MON) == 0)
+ continue;
+ p += sprintf(p, "%s, ", idle_tbl[i].id_name);
+ }
+ error = sysctl_handle_string(oidp, avail, 0, req);
+ free(avail, M_TEMP);
+ return (error);
+}
+
+static int
+idle_sysctl(SYSCTL_HANDLER_ARGS)
{
+ char buf[16];
+ int error;
+ char *p;
+ int i;
-#ifdef SMP
- if (mp_grab_cpu_hlt())
- return;
-#endif
- if (cpu_idle_hlt) {
- disable_intr();
- if (sched_runnable())
- enable_intr();
- else
- (*cpu_idle_hook)();
+ p = "unknown";
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (idle_tbl[i].id_fn == cpu_idle_fn) {
+ p = idle_tbl[i].id_name;
+ break;
+ }
+ }
+ strncpy(buf, p, sizeof(buf));
+ error = sysctl_handle_string(oidp, buf, sizeof(buf), req);
+ if (error != 0 || req->newptr == NULL)
+ return (error);
+ for (i = 0; idle_tbl[i].id_name != NULL; i++) {
+ if (strstr(idle_tbl[i].id_name, "mwait") &&
+ (cpu_feature2 & CPUID2_MON) == 0)
+ continue;
+ if (strcmp(idle_tbl[i].id_name, buf))
+ continue;
+ cpu_idle_fn = idle_tbl[i].id_fn;
+ return (0);
}
+ return (EINVAL);
}
-/* Other subsystems (e.g., ACPI) can hook this later. */
-void (*cpu_idle_hook)(void) = cpu_idle_default;
+SYSCTL_PROC(_machdep, OID_AUTO, idle_available, CTLTYPE_STRING | CTLFLAG_RD,
+ 0, 0, idle_sysctl_available, "A", "list of available idle functions");
+
+SYSCTL_PROC(_machdep, OID_AUTO, idle, CTLTYPE_STRING | CTLFLAG_RW, 0, 0,
+ idle_sysctl, "A", "currently selected idle function");
/*
* Clear registers on exec
==== //depot/projects/soc2008/snagg-audit/sys/amd64/amd64/pmap.c#2 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.614 2008/04/10 16:04:50 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.615 2008/04/25 16:00:39 alc Exp $");
/*
* Manages physical address maps.
@@ -2266,7 +2266,7 @@
* the 2mpage to referencing the page table page.
*/
if ((oldpde & PG_MANAGED) != 0)
- pmap_pv_demote_pde(pmap, va, oldpde & PG_FRAME);
+ pmap_pv_demote_pde(pmap, va, oldpde & PG_PS_FRAME);
pmap_pde_demotions++;
CTR2(KTR_PMAP, "pmap_demote_pde: success for va %#lx"
@@ -2301,10 +2301,10 @@
pmap_invalidate_page(kernel_pmap, sva);
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
if (oldpde & PG_MANAGED) {
- pvh = pa_to_pvh(oldpde & PG_FRAME);
+ pvh = pa_to_pvh(oldpde & PG_PS_FRAME);
pmap_pvh_free(pvh, pmap, sva);
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
if ((oldpde & (PG_M | PG_RW)) == (PG_M | PG_RW))
vm_page_dirty(m);
@@ -2600,7 +2600,7 @@
oldpde = newpde = *pde;
if (oldpde & PG_MANAGED) {
eva = sva + NBPDR;
- for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_FRAME);
+ for (va = sva, m = PHYS_TO_VM_PAGE(oldpde & PG_PS_FRAME);
va < eva; va += PAGE_SIZE, m++) {
/*
* In contrast to the analogous operation on a 4KB page
@@ -2839,7 +2839,7 @@
* Promote the pv entries.
*/
if ((newpde & PG_MANAGED) != 0)
- pmap_pv_promote_pde(pmap, va, newpde & PG_FRAME);
+ pmap_pv_promote_pde(pmap, va, newpde & PG_PS_FRAME);
/*
* Propagate the PAT index to its proper position.
@@ -3820,7 +3820,7 @@
pc->pc_map[field] |= bitmask;
if ((tpte & PG_PS) != 0) {
pmap->pm_stats.resident_count -= NBPDR / PAGE_SIZE;
- pvh = pa_to_pvh(tpte & PG_FRAME);
+ pvh = pa_to_pvh(tpte & PG_PS_FRAME);
TAILQ_REMOVE(&pvh->pv_list, pv, pv_list);
if (TAILQ_EMPTY(&pvh->pv_list)) {
for (mt = m; mt < &m[NBPDR / PAGE_SIZE]; mt++)
@@ -4029,7 +4029,7 @@
* table page.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
rtval++;
if (rtval > 4) {
@@ -4098,7 +4098,7 @@
* write access may repromote.
*/
va += VM_PAGE_TO_PHYS(m) - (oldpde &
- PG_FRAME);
+ PG_PS_FRAME);
pte = pmap_pde_to_pte(pde, va);
oldpte = *pte;
if ((oldpte & PG_V) != 0) {
@@ -4163,7 +4163,8 @@
* fully populated, this removal never frees
* a page table page.
*/
- va += VM_PAGE_TO_PHYS(m) - (oldpde & PG_FRAME);
+ va += VM_PAGE_TO_PHYS(m) - (oldpde &
+ PG_PS_FRAME);
pmap_remove_page(pmap, va, pde, NULL);
}
}
==== //depot/projects/soc2008/snagg-audit/sys/amd64/include/pcpu.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.48 2007/06/04 21:38:45 attilio Exp $
+ * $FreeBSD: src/sys/amd64/include/pcpu.h,v 1.49 2008/04/25 05:18:48 jeff Exp $
*/
#ifndef _MACHINE_PCPU_H_
@@ -43,6 +43,7 @@
* other processors"
*/
#define PCPU_MD_FIELDS \
+ char pc_monitorbuf[128] __aligned(128); /* cache line */ \
struct pcpu *pc_prvspace; /* Self-reference */ \
struct pmap *pc_curpmap; \
struct amd64tss *pc_tssp; \
==== //depot/projects/soc2008/snagg-audit/sys/arm/arm/machdep.c#2 (text+ko) ====
@@ -46,7 +46,7 @@
#include "opt_ddb.h"
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.30 2008/04/03 16:44:49 imp Exp $");
+__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.31 2008/04/25 05:18:48 jeff Exp $");
#include <sys/param.h>
#include <sys/proc.h>
@@ -326,12 +326,19 @@
}
void
-cpu_idle(void)
+cpu_idle(int busy)
{
cpu_sleep(0);
}
int
+cpu_idle_wakeup(int cpu)
+{
+
+ return (0);
+}
+
+int
fill_regs(struct thread *td, struct reg *regs)
{
struct trapframe *tf = td->td_frame;
==== //depot/projects/soc2008/snagg-audit/sys/conf/files#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/files,v 1.1294 2008/04/21 10:09:53 phk Exp $
+# $FreeBSD: src/sys/conf/files,v 1.1295 2008/04/25 20:42:48 sam Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -732,6 +732,48 @@
dev/ips/ips_ioctl.c optional ips
dev/ips/ips_pci.c optional ips pci
dev/ipw/if_ipw.c optional ipw
+ipwbssfw.c optional ipwbssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_bss.fw:ipw_bss:130 -lintel_ipw -mipw_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwbssfw.c"
+ipw_bss.fwo optional ipwbssfw | ipwfw \
+ dependency "ipw_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_bss.fw" \
+ no-implicit-rule \
+ clean "ipw_bss.fwo"
+ipw_bss.fw optional ipwbssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_bss.fw"
+ipwibssfw.c optional ipwibssfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_ibss.fw:ipw_ibss:130 -lintel_ipw -mipw_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwibssfw.c"
+ipw_ibss.fwo optional ipwibssfw | ipwfw \
+ dependency "ipw_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_ibss.fw" \
+ no-implicit-rule \
+ clean "ipw_ibss.fwo"
+ipw_ibss.fw optional ipwibssfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-i.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_ibss.fw"
+ipwmonitorfw.c optional ipwmonitorfw | ipwfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk ipw_monitor.fw:ipw_monitor:130 -lintel_ipw -mipw_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "ipwmonitorfw.c"
+ipw_monitor.fwo optional ipwmonitorfw | ipwfw \
+ dependency "ipw_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} ipw_monitor.fw" \
+ no-implicit-rule \
+ clean "ipw_monitor.fwo"
+ipw_monitor.fw optional ipwmonitorfw | ipwfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ipw/ipw2100-1.3-p.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "ipw_monitor.fw"
dev/iscsi/initiator/iscsi.c optional iscsi_initiator scbus
dev/iscsi/initiator/iscsi_subr.c optional iscsi_initiator scbus
dev/iscsi/initiator/isc_cam.c optional iscsi_initiator scbus
@@ -746,6 +788,48 @@
dev/isp/isp_target.c optional isp
dev/ispfw/ispfw.c optional ispfw
dev/iwi/if_iwi.c optional iwi
+iwibssfw.c optional iwibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_bss.fw:iwi_bss:300 -lintel_iwi -miwi_bss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwibssfw.c"
+iwi_bss.fwo optional iwibssfw | iwifw \
+ dependency "iwi_bss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_bss.fw" \
+ no-implicit-rule \
+ clean "iwi_bss.fwo"
+iwi_bss.fw optional iwibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-bss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_bss.fw"
+iwiibssfw.c optional iwiibssfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_ibss.fw:iwi_ibss:300 -lintel_iwi -miwi_ibss -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwiibssfw.c"
+iwi_ibss.fwo optional iwiibssfw | iwifw \
+ dependency "iwi_ibss.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_ibss.fw" \
+ no-implicit-rule \
+ clean "iwi_ibss.fwo"
+iwi_ibss.fw optional iwiibssfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-ibss.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_ibss.fw"
+iwimonitorfw.c optional iwimonitorfw | iwifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk iwi_monitor.fw:iwi_monitor:300 -lintel_iwi -miwi_monitor -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "iwimonitorfw.c"
+iwi_monitor.fwo optional iwimonitorfw | iwifw \
+ dependency "iwi_monitor.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} iwi_monitor.fw" \
+ no-implicit-rule \
+ clean "iwi_monitor.fwo"
+iwi_monitor.fw optional iwimonitorfw | iwifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/iwi/ipw2200-sniffer.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "iwi_monitor.fw"
dev/ixgb/if_ixgb.c optional ixgb
dev/ixgb/ixgb_ee.c optional ixgb
dev/ixgb/ixgb_hw.c optional ixgb
@@ -922,6 +1006,62 @@
dev/ral/rt2560.c optional ral
dev/ral/rt2661.c optional ral
dev/ral/if_ral_pci.c optional ral pci
+rt2561fw.c optional rt2561fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561.fw:rt2561fw -mrt2561 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561fw.c"
+rt2561fw.fwo optional rt2561fw | ralfw \
+ dependency "rt2561.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561.fw" \
+ no-implicit-rule \
+ clean "rt2561.fwo"
+rt2561.fw optional rt2561fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561.fw"
+rt2561sfw.c optional rt2561sfw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2561s.fw:rt2561sfw -mrt2561s -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2561sfw.c"
+rt2561sfw.fwo optional rt2561sfw | ralfw \
+ dependency "rt2561s.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2561s.fw" \
+ no-implicit-rule \
+ clean "rt2561s.fwo"
+rt2561s.fw optional rt2561sfw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2561s.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2561s.fw"
+rt2661fw.c optional rt2661fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2661.fw:rt2661fw -mrt2661 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2661fw.c"
+rt2661fw.fwo optional rt2661fw | ralfw \
+ dependency "rt2661.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2661.fw" \
+ no-implicit-rule \
+ clean "rt2661.fwo"
+rt2661.fw optional rt2661fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2661.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2661.fw"
+rt2860fw.c optional rt2860fw | ralfw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk rt2860.fw:rt2860fw -mrt2860 -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "rt2860fw.c"
+rt2860fw.fwo optional rt2860fw | ralfw \
+ dependency "rt2860.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} rt2860.fw" \
+ no-implicit-rule \
+ clean "rt2860.fwo"
+rt2860.fw optional rt2860fw | ralfw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/ral/rt2860.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "rt2860.fw"
dev/random/harvest.c standard
dev/random/hash.c optional random
dev/random/probe.c optional random
@@ -1183,6 +1323,20 @@
dev/wi/if_wi_pccard.c optional wi pccard
dev/wi/if_wi_pci.c optional wi pci
dev/wl/if_wl.c optional wl isa
+wpifw.c optional wpifw \
+ compile-with "${AWK} -f $S/tools/fw_stub.awk wpi.fw:wpifw:2144 -lintel_wpi -mwpi -c${.TARGET}" \
+ no-implicit-rule before-depend local \
+ clean "wpifw.c"
+wpifw.fwo optional wpifw \
+ dependency "wpi.fw" \
+ compile-with "${LD} -b binary -d -warn-common -r -d -o ${.TARGET} wpi.fw" \
+ no-implicit-rule \
+ clean "wpi.fwo"
+wpi.fw optional wpifw \
+ dependency ".PHONY" \
+ compile-with "uudecode -o ${.TARGET} $S/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu" \
+ no-obj no-implicit-rule \
+ clean "wpi.fw"
dev/xe/if_xe.c optional xe
dev/xe/if_xe_pccard.c optional xe pccard
fs/coda/coda_fbsd.c optional vcoda
==== //depot/projects/soc2008/snagg-audit/sys/conf/files.sparc64#2 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sparc64,v 1.94 2008/02/11 21:40:22 marius Exp $
+# $FreeBSD: src/sys/conf/files.sparc64,v 1.95 2008/04/26 11:01:37 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -83,7 +83,6 @@
sparc64/pci/ofw_pcib.c optional pci
sparc64/pci/ofw_pcib_subr.c optional pci
sparc64/pci/ofw_pcibus.c optional pci
-sparc64/pci/ofw_pci_if.m optional pci
sparc64/pci/psycho.c optional pci
sparc64/sbus/dma_sbus.c optional sbus
sparc64/sbus/sbus.c optional sbus
==== //depot/projects/soc2008/snagg-audit/sys/conf/files.sun4v#2 (text+ko) ====
@@ -1,7 +1,7 @@
# This file tells config what files go into building a kernel,
# files marked standard are always included.
#
-# $FreeBSD: src/sys/conf/files.sun4v,v 1.13 2007/12/02 20:40:31 rwatson Exp $
+# $FreeBSD: src/sys/conf/files.sun4v,v 1.14 2008/04/26 11:01:37 marius Exp $
#
# The long compile-with and dependency lines are required because of
# limitations in config: backslash-newline doesn't work in strings, and
@@ -49,7 +49,6 @@
sparc64/pci/ofw_pcib.c optional pci
sparc64/pci/ofw_pcib_subr.c optional pci
sparc64/pci/ofw_pcibus.c optional pci
-sparc64/pci/ofw_pci_if.m optional pci
# XXX hvcons should be optional
sun4v/sun4v/hvcons.c standard
==== //depot/projects/soc2008/snagg-audit/sys/ddb/db_capture.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.5 2008/01/26 23:02:14 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/ddb/db_capture.c,v 1.6 2008/04/25 13:23:36 rwatson Exp $");
#include "opt_ddb.h"
@@ -83,13 +83,16 @@
static SYSCTL_NODE(_debug_ddb, OID_AUTO, capture, CTLFLAG_RW, 0,
"DDB capture options");
-SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bytes, CTLFLAG_RD,
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, bufoff, CTLFLAG_RD,
&db_capture_bufoff, 0, "Bytes of data in DDB capture buffer");
SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, maxbufsize, CTLFLAG_RD,
&db_capture_maxbufsize, 0,
"Maximum value for debug.ddb.capture.bufsize");
+SYSCTL_UINT(_debug_ddb_capture, OID_AUTO, inprogress, CTLFLAG_RD,
+ &db_capture_inprogress, 0, "DDB output capture in progress");
+
/*
* Boot-time allocation of the DDB capture buffer, if any. Force all buffer
* sizes, including the maximum size, to be rounded to block sizes.
==== //depot/projects/soc2008/snagg-audit/sys/dev/acpica/acpi_thermal.c#2 (text+ko) ====
@@ -26,7 +26,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.69 2008/02/16 07:15:34 ume Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/acpica/acpi_thermal.c,v 1.70 2008/04/25 16:45:13 rpaulo Exp $");
#include "opt_acpi.h"
#include <sys/param.h>
@@ -90,6 +90,7 @@
int tz_temperature; /*Current temperature*/
int tz_active; /*Current active cooling*/
#define TZ_ACTIVE_NONE -1
+#define TZ_ACTIVE_UNKNOWN -2
int tz_requested; /*Minimum active cooling*/
int tz_thflags; /*Current temp-related flags*/
#define TZ_THFLAG_NONE 0
@@ -202,7 +203,7 @@
sc->tz_dev = dev;
sc->tz_handle = acpi_get_handle(dev);
sc->tz_requested = TZ_ACTIVE_NONE;
- sc->tz_active = TZ_ACTIVE_NONE;
+ sc->tz_active = TZ_ACTIVE_UNKNOWN;
sc->tz_thflags = TZ_THFLAG_NONE;
sc->tz_cooling_proc = NULL;
sc->tz_cooling_proc_running = FALSE;
@@ -520,6 +521,7 @@
* minimum cooling run time if requested.
*/
if (acpi_tz_min_runtime > 0 && sc->tz_active != TZ_ACTIVE_NONE &&
+ sc->tz_active != TZ_ACTIVE_UNKNOWN &&
(newactive == TZ_ACTIVE_NONE || newactive > sc->tz_active)) {
getnanotime(&curtime);
@@ -543,6 +545,23 @@
newflags |= TZ_THFLAG_CRT;
/* If the active cooling state has changed, we have to switch things. */
+ if (sc->tz_active == TZ_ACTIVE_UNKNOWN) {
+ /*
+ * We don't know which cooling device is on or off,
+ * so stop them all, because we now know which
+ * should be on (if any).
+ */
+ for (i = 0; i < TZ_NUMLEVELS; i++) {
+ if (sc->tz_zone.al[i].Pointer != NULL) {
+ acpi_ForeachPackageObject(
+ (ACPI_OBJECT *)sc->tz_zone.al[i].Pointer,
+ acpi_tz_switch_cooler_off, sc);
+ }
+ }
+ /* now we know that all devices are off */
+ sc->tz_active = TZ_ACTIVE_NONE;
+ }
+
if (newactive != sc->tz_active) {
/* Turn off the cooling devices that are on, if any are */
if (sc->tz_active != TZ_ACTIVE_NONE)
==== //depot/projects/soc2008/snagg-audit/sys/dev/bge/if_bge.c#2 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.205 2008/04/08 11:51:17 bz Exp $");
+__FBSDID("$FreeBSD: src/sys/dev/bge/if_bge.c,v 1.206 2008/04/26 10:54:17 marius Exp $");
/*
* Broadcom BCM570x family gigabit ethernet driver for FreeBSD.
@@ -1894,16 +1894,10 @@
/*
* Allocate the parent bus DMA tag appropriate for PCI.
*/
- error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev), /* parent */
- 1, 0, /* alignment, boundary */
- BUS_SPACE_MAXADDR, /* lowaddr */
- BUS_SPACE_MAXADDR, /* highaddr */
- NULL, NULL, /* filter, filterarg */
- MAXBSIZE, BGE_NSEG_NEW, /* maxsize, nsegments */
- BUS_SPACE_MAXSIZE_32BIT, /* maxsegsize */
- 0, /* flags */
- NULL, NULL, /* lockfunc, lockarg */
- &sc->bge_cdata.bge_parent_tag);
+ error = bus_dma_tag_create(bus_get_dma_tag(sc->bge_dev),
+ 1, 0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL,
+ NULL, BUS_SPACE_MAXSIZE_32BIT, 0, BUS_SPACE_MAXSIZE_32BIT,
+ 0, NULL, NULL, &sc->bge_cdata.bge_parent_tag);
if (error != 0) {
device_printf(sc->bge_dev,
@@ -1912,7 +1906,7 @@
}
/*
- * Create tag for RX mbufs.
+ * Create tag for mbufs.
*/
error = bus_dma_tag_create(sc->bge_cdata.bge_parent_tag, 1,
0, BUS_SPACE_MAXADDR, BUS_SPACE_MAXADDR, NULL,
@@ -3402,7 +3396,7 @@
error = bus_dmamap_load_mbuf_sg(sc->bge_cdata.bge_mtag, map, m, segs,
&nsegs, BUS_DMA_NOWAIT);
if (error == EFBIG) {
- m = m_defrag(m, M_DONTWAIT);
+ m = m_collapse(m, M_DONTWAIT, BGE_NSEG_NEW);
if (m == NULL) {
m_freem(*m_head);
*m_head = NULL;
==== //depot/projects/soc2008/snagg-audit/sys/dev/em/e1000_82571.c#2 (text+ko) ====
@@ -30,7 +30,7 @@
POSSIBILITY OF SUCH DAMAGE.
******************************************************************************/
-/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.6 2008/04/02 22:00:35 jfv Exp $*/
+/*$FreeBSD: src/sys/dev/em/e1000_82571.c,v 1.7 2008/04/25 21:19:39 jfv Exp $*/
/* e1000_82571
* e1000_82572
@@ -150,6 +150,25 @@
goto out;
}
break;
+ case e1000_82574:
+ phy->type = e1000_phy_bm;
+ phy->ops.get_cfg_done = e1000_get_cfg_done_generic;
+ phy->ops.get_info = e1000_get_phy_info_m88;
+ phy->ops.commit = e1000_phy_sw_reset_generic;
+ phy->ops.force_speed_duplex = e1000_phy_force_speed_duplex_m88;
+ phy->ops.get_cable_length = e1000_get_cable_length_m88;
+ phy->ops.read_reg = e1000_read_phy_reg_bm2;
+ phy->ops.write_reg = e1000_write_phy_reg_bm2;
+
+ /* This uses above function pointers */
+ ret_val = e1000_get_phy_id_82571(hw);
+ /* Verify PHY ID */
+ if (phy->id != BME1000_E_PHY_ID_R2) {
+ ret_val = -E1000_ERR_PHY;
+ DEBUGOUT1("PHY ID unknown: type = 0x%08x\n", phy->id);
+ goto out;
+ }
+ break;
default:
ret_val = -E1000_ERR_PHY;
goto out;
@@ -193,6 +212,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
if (((eecd >> 15) & 0x3) == 0x3) {
nvm->type = e1000_nvm_flash_hw;
nvm->word_size = 2048;
@@ -374,6 +394,7 @@
{
struct e1000_phy_info *phy = &hw->phy;
s32 ret_val = E1000_SUCCESS;
+ u16 phy_id = 0;
DEBUGFUNC("e1000_get_phy_id_82571");
@@ -391,11 +412,26 @@
case e1000_82573:
ret_val = e1000_get_phy_id(hw);
break;
+ case e1000_82574:
+ ret_val = phy->ops.read_reg(hw, PHY_ID1, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id = (u32)(phy_id << 16);
+ usec_delay(20);
+ ret_val = phy->ops.read_reg(hw, PHY_ID2, &phy_id);
+ if (ret_val)
+ goto out;
+
+ phy->id |= (u32)(phy_id);
+ phy->revision = (u32)(phy_id & ~PHY_REVISION_MASK);
+ break;
default:
ret_val = -E1000_ERR_PHY;
break;
}
+out:
return ret_val;
}
@@ -476,7 +512,7 @@
if (ret_val)
goto out;
- if (hw->mac.type != e1000_82573)
+ if (hw->mac.type != e1000_82573 && hw->mac.type != e1000_82574)
ret_val = e1000_acquire_nvm_generic(hw);
if (ret_val)
@@ -521,6 +557,7 @@
switch (hw->mac.type) {
case e1000_82573:
+ case e1000_82574:
ret_val = e1000_write_nvm_eewr_82571(hw, offset, words, data);
break;
case e1000_82571:
@@ -825,7 +862,7 @@
* Must acquire the MDIO ownership before MAC reset.
* Ownership defaults to firmware after a reset.
*/
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
extcnf_ctrl = E1000_READ_REG(hw, E1000_EXTCNF_CTRL);
extcnf_ctrl |= E1000_EXTCNF_CTRL_MDIO_SW_OWNERSHIP;
@@ -866,7 +903,7 @@
* Need to wait for Phy configuration completion before accessing
* NVM and Phy.
*/
- if (hw->mac.type == e1000_82573)
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574)
msec_delay(25);
/* Clear any pending interrupt events. */
@@ -934,7 +971,7 @@
E1000_WRITE_REG(hw, E1000_TXDCTL(0), reg_data);
/* ...for both queues. */
- if (mac->type != e1000_82573) {
+ if (mac->type != e1000_82573 && mac->type != e1000_82574) {
reg_data = E1000_READ_REG(hw, E1000_TXDCTL(1));
reg_data = (reg_data & ~E1000_TXDCTL_WTHRESH) |
E1000_TXDCTL_FULL_TX_DESC_WB |
@@ -1014,14 +1051,14 @@
}
/* Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL);
reg &= ~(1 << 29);
E1000_WRITE_REG(hw, E1000_CTRL, reg);
}
/* Extended Device Control */
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
reg = E1000_READ_REG(hw, E1000_CTRL_EXT);
reg &= ~(1 << 23);
reg |= (1 << 22);
@@ -1048,7 +1085,7 @@
DEBUGFUNC("e1000_clear_vfta_82571");
- if (hw->mac.type == e1000_82573) {
+ if (hw->mac.type == e1000_82573 || hw->mac.type == e1000_82574) {
if (hw->mng_cookie.vlan_id != 0) {
/*
* The VFTA is a 4096b bit-field, each identifying
@@ -1121,7 +1158,8 @@
* the default flow control setting, so we explicitly
* set it to full.
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 15:43:55 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 1551F1065673; Sat, 26 Apr 2008 15:43:55 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id CB776106566C
for <perforce@freebsd.org>; Sat, 26 Apr 2008 15:43:54 +0000 (UTC)
(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id BD1E68FC0A
for <perforce@freebsd.org>; Sat, 26 Apr 2008 15:43:54 +0000 (UTC)
(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QFhsew016578
for <perforce@freebsd.org>; Sat, 26 Apr 2008 15:43:54 GMT
(envelope-from carvay@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QFhsgQ016576
for perforce@freebsd.org; Sat, 26 Apr 2008 15:43:54 GMT
(envelope-from carvay@freebsd.org)
Date: Sat, 26 Apr 2008 15:43:54 GMT
Message-Id: <200804261543.m3QFhsgQ016576@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
carvay@freebsd.org using -f
From: "J. Vicente Carrasco" <carvay@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140679 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 15:43:55 -0000
http://perforce.freebsd.org/chv.cgi?CH=140679
Change 140679 by carvay@carvay_zolocho.tugurbio.org on 2008/04/26 15:43:11
- Rewritting of some parts of the translation.
Affected files ...
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/article.sgml#4 edit
Differences ...
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/errata/article.sgml#4 (text+ko) ====
@@ -63,7 +63,7 @@
</articleinfo>
<abstract>
- <para>Este documento enumera elementos de errata acerca de &os;
+ <para>Este documento enumera errores de &os;
<![ %release.type.current [
&release.current;,
]]>
@@ -73,16 +73,17 @@
<![ %release.type.release [
&release.current;,
]]>
- teniendo información significativa descubierta después
- de la release o en una fase demasiado tarde del proceso de la release
- para incluir en la documentación de ella.
- Estas informaciones incluyen no solamente avisos de seguridad sino
- también noticias relacionadas al software o a la
- documentación que afectará su funcionamiento o uso.
- Debe consultar la versión actual de este documento antes
- de instalar esta versión de &os;.</para>
+ y la información significativa descubierta después
+ de la release o en una fase demasiado avanzada del proceso de
+ liberación de la release que que se pudieran incluir en
+ la documentación de la misma. Esta información
+ incluye no solo avisos de seguridad, sino que también se
+ facilitan noticias relacionadas con el software y la documentación
+ que pudieran afectar al funcionamiento o su facilidad de uso. Debe
+ consultar la versión más reciente de este documento
+ antes de instalar ésta versión de &os;.</para>
- <para>Este documento de errata para &os;
+ <para>Esta lista de errores de &os;
<![ %release.type.current [
&release.current;
]]>
@@ -92,14 +93,14 @@
<![ %release.type.release [
&release.current;
]]>
- se mantandrá hasta la release &release.next; de &os;.</para>
+ se mantendrá hasta la release &release.next; de &os;.</para>
</abstract>
<sect1 id="intro">
<title>Introducción</title>
- <para>Este documento de errata tiene <quote>noticias tardes</quote>
- acerca de &os;
+ <para>Esta lista de errores contiene las <quote>últimas
+ noticias</quote> sobre &os;
<![ %release.type.current [
&release.current;.
]]>
@@ -109,29 +110,29 @@
<![ %release.type.release [
&release.current;.
]]>
- Antes de instalar esta versión, es importante que consulte
- este documento para enterarse de los problemas que se han descubiertos
- después de la release, pero se han encontrado y solucionado
- ya.</para>
+ Antes de instalar dicha versión es importante que consulte
+ este documento para enterarse de los problemas descubiertos
+ después de la release y ya solucionados.</para>
- <para>Cualquier versión de este documento que se distribuye
+ <para>Cualquier versión de este documento que se distribuya
con la release (p.ej. en un CD-ROM) estará desactualizada
por definición, pero las copias en línea se
- mantendrán actualizadas en el Internet como el
- <quote>errata actual</quote> para colsultar sobre esta release.
- Éstas se encuentran en <ulink
- url="http://www.FreeBSD.org/releases/"></ulink> más en
- cualquier sitio que mantenga un espejo actualizado de esta
- locación.</para>
+ mantendrán actualizadas en Internet y por tanto puede recurrirse
+ a ellas como <quote>lista actualizada de errores</quote> de esta
+ release. Dichas listas están en <ulink
+ url="http://www.FreeBSD.org/releases/"></ulink> y en cualquiera
+ de las múltiples réplicas (<quote>mirrors</quote>) del
+ sitio web de &os;.</para>
- <para>Instantáneas binárias o de fuente de la
- bifurcación &release.branch; de &os; también
- tienen una copia actualizada de este documento (al tiempo
- de la instantánea).</para>
+ <para>Tanto las instantáneas binárias
+ (o <quote>snapshots</quote>) como el código fuente
+ de la rama &release.branch; de &os; contienen una copia
+ actualizada de este documento (de la misma fecha que
+ la instantánea).</para>
- <para>Consulte la lista de todos los avisos CERT de seguridad
- de &os; aquí: <ulink
- url="http://www.FreeBSD.org/security/"></ulink> or <ulink
+ <para>Consulte la lista completa de avisos de seguridad del CERT
+ relacionados con &os; en <ulink
+ url="http://www.FreeBSD.org/security/"></ulink> o en <ulink
url="ftp://ftp.FreeBSD.org/pub/FreeBSD/CERT/"></ulink>.</para>
</sect1>
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 17:51:09 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 6555B1065678; Sat, 26 Apr 2008 17:51:09 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 0FCF6106567A
for <perforce@freebsd.org>; Sat, 26 Apr 2008 17:51:09 +0000 (UTC)
(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 00D578FC15
for <perforce@freebsd.org>; Sat, 26 Apr 2008 17:51:09 +0000 (UTC)
(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QHp82X044520
for <perforce@freebsd.org>; Sat, 26 Apr 2008 17:51:08 GMT
(envelope-from carvay@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QHp8oj044518
for perforce@freebsd.org; Sat, 26 Apr 2008 17:51:08 GMT
(envelope-from carvay@freebsd.org)
Date: Sat, 26 Apr 2008 17:51:08 GMT
Message-Id: <200804261751.m3QHp8oj044518@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
carvay@freebsd.org using -f
From: "J. Vicente Carrasco" <carvay@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140684 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 17:51:09 -0000
http://perforce.freebsd.org/chv.cgi?CH=140684
Change 140684 by carvay@carvay_zolocho.tugurbio.org on 2008/04/26 17:50:37
- Cosmetic changes.
Affected files ...
.. //depot/projects/docproj_es/LEEME#2 edit
Differences ...
==== //depot/projects/docproj_es/LEEME#2 (text+ko) ====
@@ -1,15 +1,15 @@
===============================================================================
-Cabaceras de los documentos fuentes
+Cabeceras de los documentos fuentes
===============================================================================
-Por favor, añaded y mantenid cabeceras uniformes para los fuentes en el formato
+Por favor, añadid y mantened cabeceras uniformes para los fuentes en el formato
siguiente:
<!-- The FreeBSD Spanish Documentation Project
Original Revision: r1.23 -->
-Esto nos ayudará actualizar el contenido por comparar que se ha cambiado
-desde la versión traducida en el árbol inglés.
+Esto nos ayudará a actualizar el contenido por comparar qué se ha cambiado
+desde la versión traducida en el árbol en inglés.
===============================================================================
@@ -45,25 +45,24 @@
Configurar Perforce
===============================================================================
-1, Instala devel/perforce.
-2, Ajusta los "environmental variables" en tu shell:
+1, Instalar devel/perforce.
+2, Ajustar las variables de entorno de la shell:
P4PORT=perforce.freebsd.org:1666
P4USER=tuusuario
P4CLIENT=tuusuario_tuhost
P4PASSWD=tucontraseña
P4DIFF=/usr/bin/diff
-3, Ejecuta "p4 client". Tu editor por defecto se aparecerá con los ajustes.
+3, Ejecutar "p4 client". Tu editor por omisión aparecerá con los ajustes.
Los seis primeros ajustes te quedarán claros. Lo demás:
- Root - La carpeta principal de tu copia local,
+ Root - Directorio raíz de tu copia local,
p.ej. /home/tuusuario/perforce
LineEnd - Los separadores de las línes (CR, LF, CR/LF).
- Si usas FreeBSD u otro entorno de UNIX, pon
- "local" allí.
+ Si usas FreeBSD u otro UNIX pon "local".
View: - Determina en qué partes vas a querer trabajar,
es decir, qué partes quieres ver en tu copia local.
P.ej.: //depot/projects/docproj_es/... //tuusuario_tuhost/projects/docproj_es/...
-4, Crea la carpeta que has elegido para el ajuste "Root".
-5, Ejecuta "p4 sync" para obtener el repositorio en tu carpeta y ya puedes
+4, Crea el directorio que has elegido como "Root".
+5, Ejecuta "p4 sync" para obtener el repositorio en local y ya puedes
traducir.
6, No olvides ejecutar "p4 sync" con cierta frecuencia para sincronizar
tu copia local con el repositorio y así obtener los cambios que los
@@ -101,5 +100,5 @@
¿Falta algo?
===============================================================================
-Si piensas que hace falta algo en este documento, por favor extiéndelo con
+Si piensas que hace falta algo en este documento, por favor amplíalo con
tus ideas.
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 17:54:12 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id C6D061065677; Sat, 26 Apr 2008 17:54:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 88C041065670
for <perforce@freebsd.org>; Sat, 26 Apr 2008 17:54:12 +0000 (UTC)
(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 7A5008FC18
for <perforce@freebsd.org>; Sat, 26 Apr 2008 17:54:12 +0000 (UTC)
(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QHsC7V044810
for <perforce@freebsd.org>; Sat, 26 Apr 2008 17:54:12 GMT
(envelope-from carvay@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QHsCNk044806
for perforce@freebsd.org; Sat, 26 Apr 2008 17:54:12 GMT
(envelope-from carvay@freebsd.org)
Date: Sat, 26 Apr 2008 17:54:12 GMT
Message-Id: <200804261754.m3QHsCNk044806@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
carvay@freebsd.org using -f
From: "J. Vicente Carrasco" <carvay@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140685 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 17:54:13 -0000
http://perforce.freebsd.org/chv.cgi?CH=140685
Change 140685 by carvay@carvay_zolocho.tugurbio.org on 2008/04/26 17:53:23
- Review of translation.
Affected files ...
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/share/sgml/release.dsl#3 edit
Differences ...
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/share/sgml/release.dsl#3 (text+ko) ====
@@ -38,9 +38,9 @@
(make element gi: "p"
attributes: (list (list "align" "center"))
(make element gi: "small"
- (literal "Cada usuario de FreeBSD ")
+ (literal "Recomendamos a los usuarios de FreeBSD ")
(literal (entity-text "release.branch"))
- (literal " debe suscribirse a la lista lista de distribución ")
+ (literal " que se suscriban a la lista de correo ")
(literal "<")
(create-link (list (list "HREF" "mailto:current@FreeBSD.org"))
(literal "current@FreeBSD.org"))
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 18:05:33 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 126FF1065670; Sat, 26 Apr 2008 18:05:33 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id C88C0106566B
for <perforce@freebsd.org>; Sat, 26 Apr 2008 18:05:32 +0000 (UTC)
(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id BA2DD8FC0A
for <perforce@freebsd.org>; Sat, 26 Apr 2008 18:05:32 +0000 (UTC)
(envelope-from marius@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QI5WKw048675
for <perforce@freebsd.org>; Sat, 26 Apr 2008 18:05:32 GMT
(envelope-from marius@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QI5WAr048673
for perforce@freebsd.org; Sat, 26 Apr 2008 18:05:32 GMT
(envelope-from marius@freebsd.org)
Date: Sat, 26 Apr 2008 18:05:32 GMT
Message-Id: <200804261805.m3QI5WAr048673@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
marius@freebsd.org using -f
From: Marius Strobl <marius@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140687 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 18:05:33 -0000
http://perforce.freebsd.org/chv.cgi?CH=140687
Change 140687 by marius@flak on 2008/04/26 18:04:34
Actually adjust schizo(4) to the removal of isa_irq_pending().
Affected files ...
.. //depot/projects/usiii/sparc64/pci/schizo.c#7 edit
Differences ...
==== //depot/projects/usiii/sparc64/pci/schizo.c#7 (text+ko) ====
@@ -116,7 +116,6 @@
static pcib_read_config_t schizo_read_config;
static pcib_write_config_t schizo_write_config;
static pcib_route_interrupt_t schizo_route_interrupt;
-static ofw_pci_intr_pending_t schizo_intr_pending;
static ofw_bus_get_node_t schizo_get_node;
static device_method_t schizo_methods[] = {
@@ -147,9 +146,6 @@
/* ofw_bus interface */
DEVMETHOD(ofw_bus_get_node, schizo_get_node),
- /* ofw_pci interface */
- DEVMETHOD(ofw_pci_intr_pending, schizo_intr_pending),
-
{ 0, 0 }
};
@@ -1174,16 +1170,6 @@
return (sc->sc_pci_dmat);
}
-static int
-schizo_intr_pending(device_t dev, ofw_pci_intr_t intr)
-{
- struct schizo_softc *sc;
-
- sc = device_get_softc(dev);
- return (SCZTOM_PCI_READ_8(sc, SCZTOM_PCI_IOBIO_DIAG) >>
- ((intr & 0x1f) << 1) != 0);
-}
-
static phandle_t
schizo_get_node(device_t bus, device_t dev)
{
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 18:09:37 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 901521065676; Sat, 26 Apr 2008 18:09:37 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 520F61065670
for <perforce@freebsd.org>; Sat, 26 Apr 2008 18:09:37 +0000 (UTC)
(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 438298FC13
for <perforce@freebsd.org>; Sat, 26 Apr 2008 18:09:37 +0000 (UTC)
(envelope-from carvay@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QI9br8049066
for <perforce@freebsd.org>; Sat, 26 Apr 2008 18:09:37 GMT
(envelope-from carvay@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QI9bhA049064
for perforce@freebsd.org; Sat, 26 Apr 2008 18:09:37 GMT
(envelope-from carvay@freebsd.org)
Date: Sat, 26 Apr 2008 18:09:37 GMT
Message-Id: <200804261809.m3QI9bhA049064@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
carvay@freebsd.org using -f
From: "J. Vicente Carrasco" <carvay@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140689 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 18:09:37 -0000
http://perforce.freebsd.org/chv.cgi?CH=140689
Change 140689 by carvay@carvay_zolocho.tugurbio.org on 2008/04/26 18:08:56
- Fix entity and add rev. number.
Affected files ...
.. //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/relnotes/article.sgml#2 edit
Differences ...
==== //depot/projects/docproj_es/src/release/doc/es_ES.ISO8859-1/relnotes/article.sgml#2 (text+ko) ====
@@ -1,11 +1,17 @@
<!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
-<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
+<!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//ES">
%articles.ent;
<!ENTITY % release PUBLIC "-//FreeBSD//ENTITIES Release Specification//EN">
%release;
-<!-- Text constants which probably don't need to be changed.-->
+<!-- Text constants which probably don't need to be changed. -->
+
+
+<!-- The FreeBSD Spanish Documentation Project
+ Original Revision: r1.1088 -->
+
+
<!ENTITY % include.historic "IGNORE">
<!ENTITY % no.include.historic "IGNORE">
From owner-p4-projects@FreeBSD.ORG Sat Apr 26 20:34:13 2008
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
id 77F6A1065674; Sat, 26 Apr 2008 20:34:13 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id 3A9BE1065670
for <perforce@freebsd.org>; Sat, 26 Apr 2008 20:34:13 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org
[IPv6:2001:4f8:fff6::29])
by mx1.freebsd.org (Postfix) with ESMTP id 129808FC18
for <perforce@freebsd.org>; Sat, 26 Apr 2008 20:34:13 +0000 (UTC)
(envelope-from gabor@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
by repoman.freebsd.org (8.14.1/8.14.1) with ESMTP id m3QKYC7h061431
for <perforce@freebsd.org>; Sat, 26 Apr 2008 20:34:12 GMT
(envelope-from gabor@freebsd.org)
Received: (from perforce@localhost)
by repoman.freebsd.org (8.14.1/8.14.1/Submit) id m3QKYCnO061429
for perforce@freebsd.org; Sat, 26 Apr 2008 20:34:12 GMT
(envelope-from gabor@freebsd.org)
Date: Sat, 26 Apr 2008 20:34:12 GMT
Message-Id: <200804262034.m3QKYCnO061429@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
gabor@freebsd.org using -f
From: Gabor Kovesdan <gabor@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc:
Subject: PERFORCE change 140696 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 26 Apr 2008 20:34:13 -0000
http://perforce.freebsd.org/chv.cgi?CH=140696
Change 140696 by gabor@gabor_server on 2008/04/26 20:33:54
- Remove an accidentally added core file and a test file
Affected files ...
.. //depot/projects/soc2008/gabor_textproc/grep/foobar.gz#2 delete
.. //depot/projects/soc2008/gabor_textproc/grep/grep.core#2 delete
Differences ...