From owner-p4-projects@FreeBSD.ORG Fri Sep 19 02:03:05 2008 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 6F9CF106566C; Fri, 19 Sep 2008 02:03:05 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 1B806106564A for ; Fri, 19 Sep 2008 02:03:05 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id F1C1F8FC15 for ; Fri, 19 Sep 2008 02:03:04 +0000 (UTC) (envelope-from imp@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id m8J2344F066306 for ; Fri, 19 Sep 2008 02:03:04 GMT (envelope-from imp@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id m8J234uO066296 for perforce@freebsd.org; Fri, 19 Sep 2008 02:03:04 GMT (envelope-from imp@freebsd.org) Date: Fri, 19 Sep 2008 02:03:04 GMT Message-Id: <200809190203.m8J234uO066296@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to imp@freebsd.org using -f From: Warner Losh To: Perforce Change Reviews Cc: Subject: PERFORCE change 150069 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 19 Sep 2008 02:03:05 -0000 http://perforce.freebsd.org/chv.cgi?CH=150069 Change 150069 by imp@imp_paco-paco on 2008/09/19 02:02:15 Merge $FreeBSD$ expansion from svn for diff goodness. Affected files ... .. //depot/projects/mips2/src/sys/mips/mips/cache_mipsNN.c#4 edit .. //depot/projects/mips2/src/sys/mips/mips/exception.S#29 edit .. //depot/projects/mips2/src/sys/mips/mips/fp.S#3 edit .. //depot/projects/mips2/src/sys/mips/mips/gdb_machdep.c#3 edit .. //depot/projects/mips2/src/sys/mips/mips/locore.S#23 edit .. //depot/projects/mips2/src/sys/mips/mips/psraccess.S#3 edit .. //depot/projects/mips2/src/sys/mips/mips/support.S#15 edit .. //depot/projects/mips2/src/sys/mips/mips/swtch.S#16 edit .. //depot/projects/mips2/src/sys/mips/mips/tlb.S#3 edit .. //depot/projects/mips2/src/sys/mips/mips/trap.c#28 edit .. //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#21 edit .. //depot/projects/mips2/src/usr.bin/Makefile#16 edit Differences ... ==== //depot/projects/mips2/src/sys/mips/mips/cache_mipsNN.c#4 (text+ko) ==== @@ -35,6 +35,9 @@ * POSSIBILITY OF SUCH DAMAGE. */ +#include +__FBSDID("$FreeBSD: head/sys/mips/mips/cache_mipsNN.c 178172 2008-04-13 07:27:37Z imp $"); + #include #include #include ==== //depot/projects/mips2/src/sys/mips/mips/exception.S#29 (text+ko) ==== @@ -46,7 +46,7 @@ * v 1.1 89/07/10 14:27:41 nelson Exp SPRITE (DECWRL) * from: @(#)locore.s 8.5 (Berkeley) 1/4/94 * JNPR: exception.S,v 1.5 2007/01/08 04:58:37 - * $FreeBSD$ + * $FreeBSD: head/sys/mips/mips/exception.S 178172 2008-04-13 07:27:37Z imp $ */ /* ==== //depot/projects/mips2/src/sys/mips/mips/fp.S#3 (text+ko) ==== @@ -32,7 +32,7 @@ * * from: @(#)fp.s 8.1 (Berkeley) 6/10/93 * JNPR: fp.S,v 1.1 2006/08/07 05:38:57 - * $FreeBSD$ + * $FreeBSD: head/sys/mips/mips/fp.S 178172 2008-04-13 07:27:37Z imp $ */ /* ==== //depot/projects/mips2/src/sys/mips/mips/gdb_machdep.c#3 (text+ko) ==== @@ -92,7 +92,7 @@ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * * JNPR: gdb_machdep.c,v 1.1 2007/08/09 12:25:25 - * $FreeBSD$ + * $FreeBSD: head/sys/mips/mips/gdb_machdep.c 178172 2008-04-13 07:27:37Z imp $ */ #include ==== //depot/projects/mips2/src/sys/mips/mips/locore.S#23 (text+ko) ==== @@ -47,7 +47,7 @@ * * from: @(#)locore.s 8.5 (Berkeley) 1/4/94 * JNPR: locore.S,v 1.6.2.1 2007/08/29 12:24:49 - * $FreeBSD$ + * $FreeBSD: head/sys/mips/mips/locore.S 178172 2008-04-13 07:27:37Z imp $ */ /* ==== //depot/projects/mips2/src/sys/mips/mips/psraccess.S#3 (text+ko) ==== @@ -29,7 +29,7 @@ * SUCH DAMAGE. * * JNPR: psraccess.S,v 1.4.2.1 2007/09/10 10:36:50 - * $FreeBSD$ + * $FreeBSD: head/sys/mips/mips/psraccess.S 178172 2008-04-13 07:27:37Z imp $ * */ ==== //depot/projects/mips2/src/sys/mips/mips/support.S#15 (text+ko) ==== @@ -47,7 +47,7 @@ * * from: @(#)locore.s 8.5 (Berkeley) 1/4/94 * JNPR: support.S,v 1.5.2.2 2007/08/29 10:03:49 - * $FreeBSD$ + * $FreeBSD: head/sys/mips/mips/support.S 178172 2008-04-13 07:27:37Z imp $ */ /* ==== //depot/projects/mips2/src/sys/mips/mips/swtch.S#16 (text+ko) ==== @@ -47,7 +47,7 @@ * * from: @(#)locore.s 8.5 (Berkeley) 1/4/94 * JNPR: swtch.S,v 1.6.2.1 2007/09/10 10:36:50 - * $FreeBSD$ + * $FreeBSD: head/sys/mips/mips/swtch.S 178172 2008-04-13 07:27:37Z imp $ */ /* ==== //depot/projects/mips2/src/sys/mips/mips/tlb.S#3 (text+ko) ==== @@ -47,7 +47,7 @@ * * from: @(#)locore.s 8.5 (Berkeley) 1/4/94 * JNPR: tlb.S,v 1.1.4.2 2007/09/10 09:02:05 - * $FreeBSD$ + * $FreeBSD: head/sys/mips/mips/tlb.S 178172 2008-04-13 07:27:37Z imp $ */ /* ==== //depot/projects/mips2/src/sys/mips/mips/trap.c#28 (text+ko) ==== @@ -39,7 +39,7 @@ * JNPR: trap.c,v 1.13.2.2 2007/08/29 10:03:49 */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: head/sys/mips/mips/trap.c 179648 2008-06-08 08:56:46Z wkoszek $"); #include "opt_ddb.h" #include "opt_global.h" ==== //depot/projects/mips2/src/sys/mips/mips/vm_machdep.c#21 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__FBSDID("$FreeBSD$"); +__FBSDID("$FreeBSD: head/sys/mips/mips/vm_machdep.c 178172 2008-04-13 07:27:37Z imp $"); #include #include ==== //depot/projects/mips2/src/usr.bin/Makefile#16 (text+ko) ==== @@ -60,6 +60,7 @@ expand \ false \ fetch \ + file \ file2c \ find \ finger \