PERFORCE change 103147 for review

John Birrell jb at FreeBSD.org
Thu Aug 3 23:37:42 UTC 2006


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

Change 103147 by jb at jb_freebsd2 on 2006/08/03 23:36:11

	IFC

Affected files ...

.. //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#4 integrate
.. //depot/projects/dtrace/src/usr.bin/logger/logger.1#4 integrate
.. //depot/projects/dtrace/www/en/about.sgml#2 integrate

Differences ...

==== //depot/projects/dtrace/src/sys/powerpc/powerpc/machdep.c#4 (text+ko) ====

@@ -55,7 +55,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.95 2006/05/16 14:32:17 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/powerpc/powerpc/machdep.c,v 1.96 2006/08/03 22:44:46 sobomax Exp $");
 
 #include "opt_compat.h"
 #include "opt_ddb.h"
@@ -339,7 +339,7 @@
 	bcopy(&dsitrap,  (void *)EXC_DSI,  (size_t)&dsisize);
 	bcopy(&trapcode, (void *)EXC_ISI,  (size_t)&trapsize);
 	bcopy(&trapcode, (void *)EXC_EXI,  (size_t)&trapsize);
-	bcopy(&trapcode, (void *)EXC_ALI,  (size_t)&trapsize);
+	bcopy(&alitrap,  (void *)EXC_ALI,  (size_t)&alisize);
 	bcopy(&trapcode, (void *)EXC_PGM,  (size_t)&trapsize);
 	bcopy(&trapcode, (void *)EXC_FPU,  (size_t)&trapsize);
 	bcopy(&trapcode, (void *)EXC_DECR, (size_t)&trapsize);

==== //depot/projects/dtrace/src/usr.bin/logger/logger.1#4 (text+ko) ====

@@ -30,9 +30,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"	@(#)logger.1	8.1 (Berkeley) 6/6/93
-.\" $FreeBSD: src/usr.bin/logger/logger.1,v 1.17 2006/08/02 13:21:44 bms Exp $
+.\" $FreeBSD: src/usr.bin/logger/logger.1,v 1.18 2006/08/03 20:43:51 bms Exp $
 .\"
-.Dd June 6, 1993
+.Dd August 2, 2006
 .Dt LOGGER 1
 .Os
 .Sh NAME

==== //depot/projects/dtrace/www/en/about.sgml#2 (text+ko) ====

@@ -1,5 +1,5 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" [
-<!ENTITY date "$FreeBSD: www/en/about.sgml,v 1.3 2005/11/30 17:51:15 pav Exp $">
+<!ENTITY date "$FreeBSD: www/en/about.sgml,v 1.5 2006/08/03 21:45:06 blackend Exp $">
 <!ENTITY title "About FreeBSD">
 <!ENTITY % navincludes SYSTEM "includes.navabout.sgml"> %navincludes;
 <!ENTITY % includes SYSTEM "includes.sgml"> %includes;
@@ -89,7 +89,7 @@
 			  Foundation</a> is a non-profit organization for which
 	 		direct contributions are fully tax deductible.  Please
 	 		contact <a
-			  href="mailto:bod at FreeBSDFoundation.org">bod at FreeBSDFoundation.org</a>
+			  href="mailto:board at FreeBSDFoundation.org">board at FreeBSDFoundation.org</a>
 	 		for more information or write to: The FreeBSD
 	 		Foundation, 7321 Brockway Dr., Boulder, CO 80303,
  		USA.</p>


More information about the p4-projects mailing list