From owner-p4-projects  Sun Mar 31 22:15:29 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0E80E37B41B; Sun, 31 Mar 2002 22:15:23 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id 2DD4337B416
	for <perforce@freebsd.org>; Sun, 31 Mar 2002 22:15:22 -0800 (PST)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g316FMA32087
	for perforce@freebsd.org; Sun, 31 Mar 2002 22:15:22 -0800 (PST)
	(envelope-from jake@freebsd.org)
Date: Sun, 31 Mar 2002 22:15:22 -0800 (PST)
Message-Id: <200204010615.g316FMA32087@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to jake@freebsd.org using -f
From: Jake Burkholder <jake@FreeBSD.org>
Subject: PERFORCE change 8750 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8750

Change 8750 by jake@jake_sparc64 on 2002/03/31 22:15:10

	Integ ktr changes.

Affected files ...

... //depot/projects/sparc64/sys/conf/options#22 integrate
... //depot/projects/sparc64/sys/kern/kern_ktr.c#14 integrate
... //depot/projects/sparc64/sys/sparc64/sparc64/genassym.c#66 integrate
... //depot/projects/sparc64/sys/sys/ktr.h#10 integrate
... //depot/projects/sparc64/usr.bin/ktrdump/Makefile#1 branch
... //depot/projects/sparc64/usr.bin/ktrdump/ktrdump.c#1 branch

Differences ...

==== //depot/projects/sparc64/sys/conf/options#22 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/conf/options,v 1.306 2002/03/30 03:52:52 dan Exp $
+# $FreeBSD: src/sys/conf/options,v 1.307 2002/04/01 05:35:23 jake Exp $
 #
 #        On the handling of kernel options
 #

==== //depot/projects/sparc64/sys/kern/kern_ktr.c#14 (text+ko) ====

@@ -26,7 +26,7 @@
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
  * THE POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/kern/kern_ktr.c,v 1.28 2002/03/08 18:55:59 jhb Exp $
+ * $FreeBSD: src/sys/kern/kern_ktr.c,v 1.29 2002/04/01 05:35:25 jake Exp $
  */
 
 /*

==== //depot/projects/sparc64/sys/sparc64/sparc64/genassym.c#66 (text+ko) ====

@@ -24,7 +24,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)genassym.c	5.11 (Berkeley) 5/10/91
- * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.29 2002/03/21 02:30:27 jeff Exp $
+ * $FreeBSD: src/sys/sparc64/sparc64/genassym.c,v 1.30 2002/04/01 05:35:26 jake Exp $
  */
 
 #include <sys/param.h>
@@ -135,11 +135,11 @@
 ASSYM(KTR_CT8, KTR_CT8);
 
 ASSYM(KTR_SIZEOF, sizeof(struct ktr_entry));
-ASSYM(KTR_TIMESTAMP, offsetof(struct ktr_entry, ktr_timestamp));
-ASSYM(KTR_CPU, offsetof(struct ktr_entry, ktr_cpu));
 ASSYM(KTR_LINE, offsetof(struct ktr_entry, ktr_line));
 ASSYM(KTR_FILE, offsetof(struct ktr_entry, ktr_file));
 ASSYM(KTR_DESC, offsetof(struct ktr_entry, ktr_desc));
+ASSYM(KTR_CPU, offsetof(struct ktr_entry, ktr_cpu));
+ASSYM(KTR_TIMESTAMP, offsetof(struct ktr_entry, ktr_timestamp));
 ASSYM(KTR_PARM1, offsetof(struct ktr_entry, ktr_parms[0]));
 ASSYM(KTR_PARM2, offsetof(struct ktr_entry, ktr_parms[1]));
 ASSYM(KTR_PARM3, offsetof(struct ktr_entry, ktr_parms[2]));

==== //depot/projects/sparc64/sys/sys/ktr.h#10 (text+ko) ====

@@ -26,7 +26,7 @@
  * SUCH DAMAGE.
  *
  *	from BSDI $Id: ktr.h,v 1.10.2.7 2000/03/16 21:44:42 cp Exp $
- * $FreeBSD: src/sys/sys/ktr.h,v 1.15 2001/12/14 22:28:58 jhb Exp $
+ * $FreeBSD: src/sys/sys/ktr.h,v 1.16 2002/04/01 05:35:26 jake Exp $
  */
 
 /*

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message