Date: Tue, 10 Jun 2003 10:56:40 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 32925 for review Message-ID: <200306101756.h5AHuegV013817@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=32925 Change 32925 by jhb@jhb_laptop on 2003/06/10 10:56:39 IFC @32922. Affected files ... .. //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#12 integrate .. //depot/projects/smpng/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsb.c#3 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsbcpu.c#4 integrate .. //depot/projects/smpng/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#11 integrate .. //depot/projects/smpng/sys/cam/cam.c#4 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#11 integrate .. //depot/projects/smpng/sys/cam/cam_queue.c#3 integrate .. //depot/projects/smpng/sys/cam/cam_sim.c#3 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#16 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#12 (text+ko) ==== @@ -22,10 +22,7 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.24 2003/02/25 00:42:39 marcel Exp $ */ - /* * Based very closely on NetBSD version- * @@ -58,6 +55,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.25 2003/06/10 17:31:31 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/tlsb/gbus.c#2 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/tlsb/gbus.c,v 1.10 2000/03/27 08:22:23 mjacob Exp $ */ /* $NetBSD: gbus.c,v 1.8 1998/05/13 22:13:35 thorpej Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -34,6 +32,9 @@ * bus on AlphaServer CPU modules. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/gbus.c,v 1.11 2003/06/10 17:31:31 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/tlsb/kftxx.c#2 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/tlsb/kftxx.c,v 1.10 2000/08/28 21:48:06 dfr Exp $ */ /* $NetBSD: kftxx.c,v 1.9 1998/05/14 00:01:32 thorpej Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -36,6 +34,9 @@ * i.e., handler for all TLSB I/O nodes. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/kftxx.c,v 1.11 2003/06/10 17:31:31 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> ==== //depot/projects/smpng/sys/alpha/tlsb/mcclock_tlsb.c#2 (text+ko) ==== @@ -1,6 +1,4 @@ -/* $FreeBSD: src/sys/alpha/tlsb/mcclock_tlsb.c,v 1.7 2000/03/18 07:46:34 mjacob Exp $ */ /* $NetBSD: mcclock_tlsb.c,v 1.8 1998/05/13 02:50:29 thorpej Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -29,6 +27,9 @@ * SUCH DAMAGE. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/mcclock_tlsb.c,v 1.8 2003/06/10 17:31:31 obrien Exp $"); + #include <sys/param.h> #include <sys/kernel.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/alpha/tlsb/tlsb.c#3 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/alpha/tlsb/tlsb.c,v 1.14 2003/02/25 00:42:40 marcel Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -36,6 +34,9 @@ * found on AlphaServer 8200 and 8400 systems. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/tlsb.c,v 1.15 2003/06/10 17:31:31 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/tlsb/tlsbcpu.c#4 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/alpha/tlsb/tlsbcpu.c,v 1.3 2001/10/11 21:47:27 mjacob Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -33,6 +31,9 @@ * AlphaServer 8200 and 8400 systems. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/tlsbcpu.c,v 1.4 2003/06/10 17:31:31 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/tlsb/tlsbmem.c#2 (text+ko) ==== @@ -1,5 +1,3 @@ -/* $FreeBSD: src/sys/alpha/tlsb/tlsbmem.c,v 1.3 2000/03/18 07:28:27 mjacob Exp $ */ - /* * Copyright (c) 1997, 2000 by Matthew Jacob * NASA AMES Research Center. @@ -33,6 +31,9 @@ * AlphaServer 8200 and 8400 systems. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/tlsbmem.c,v 1.4 2003/06/10 17:31:31 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/kernel.h> ==== //depot/projects/smpng/sys/alpha/tlsb/zs_tlsb.c#11 (text+ko) ==== @@ -23,13 +23,16 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.35 2003/03/03 12:15:38 phk Exp $ */ + /* * This driver is a somewhat hack. A real driver might use the zs driver * source from NetBSD, except that it's no real winner either. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.36 2003/06/10 17:31:31 obrien Exp $"); + #include "opt_ddb.h" #include <sys/param.h> ==== //depot/projects/smpng/sys/cam/cam.c#4 (text+ko) ==== @@ -24,11 +24,12 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/cam/cam.c,v 1.6 2003/05/31 20:46:21 phk Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/cam/cam.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); + #include <sys/param.h> - #ifdef _KERNEL #include <sys/param.h> #include <sys/systm.h> ==== //depot/projects/smpng/sys/cam/cam_periph.c#11 (text+ko) ==== @@ -25,10 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/cam/cam_periph.c,v 1.50 2003/06/01 09:01:02 phk Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.51 2003/06/10 17:50:20 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> ==== //depot/projects/smpng/sys/cam/cam_queue.c#3 (text+ko) ==== @@ -24,9 +24,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/cam/cam_queue.c,v 1.6 2002/12/30 21:18:06 schweikh Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/cam/cam_queue.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/types.h> ==== //depot/projects/smpng/sys/cam/cam_sim.c#3 (text+ko) ==== @@ -24,10 +24,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/cam/cam_sim.c,v 1.6 2003/02/19 05:46:56 imp Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/cam/cam_sim.c,v 1.7 2003/06/10 17:50:20 obrien Exp $"); + #include <sys/param.h> #include <sys/systm.h> #include <sys/malloc.h> ==== //depot/projects/smpng/sys/cam/cam_xpt.c#16 (text+ko) ==== @@ -25,9 +25,11 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $FreeBSD: src/sys/cam/cam_xpt.c,v 1.133 2003/05/31 20:46:21 phk Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/cam/cam_xpt.c,v 1.134 2003/06/10 17:50:20 obrien Exp $"); + #include <sys/param.h> #include <sys/bus.h> #include <sys/systm.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200306101756.h5AHuegV013817>