From owner-p4-projects@FreeBSD.ORG Thu Aug 3 23:37:42 2006 Return-Path: X-Original-To: p4-projects@freebsd.org Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 7791516A4ED; Thu, 3 Aug 2006 23:37:42 +0000 (UTC) X-Original-To: perforce@freebsd.org Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 4034D16A4E8 for ; Thu, 3 Aug 2006 23:37:42 +0000 (UTC) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 5C87E43DC1 for ; Thu, 3 Aug 2006 23:37:02 +0000 (GMT) (envelope-from jb@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id k73Nb1hX095367 for ; Thu, 3 Aug 2006 23:37:01 GMT (envelope-from jb@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k73Nb0t5095364 for perforce@freebsd.org; Thu, 3 Aug 2006 23:37:00 GMT (envelope-from jb@freebsd.org) Date: Thu, 3 Aug 2006 23:37:00 GMT Message-Id: <200608032337.k73Nb0t5095364@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jb@freebsd.org using -f From: John Birrell To: Perforce Change Reviews Cc: Subject: PERFORCE change 103147 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Aug 2006 23:37:42 -0000 http://perforce.freebsd.org/chv.cgi?CH=103147 Change 103147 by jb@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 -__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 @@ + %navincludes; %includes; @@ -89,7 +89,7 @@ Foundation is a non-profit organization for which direct contributions are fully tax deductible. Please contact bod@FreeBSDFoundation.org + href="mailto:board@FreeBSDFoundation.org">board@FreeBSDFoundation.org for more information or write to: The FreeBSD Foundation, 7321 Brockway Dr., Boulder, CO 80303, USA.