From owner-p4-projects@FreeBSD.ORG  Fri Jul  7 15:23:08 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CD14416A4E1; Fri,  7 Jul 2006 15:23:08 +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 8E9E816A4DE
	for <perforce@FreeBSD.org>; Fri,  7 Jul 2006 15:23:08 +0000 (UTC)
	(envelope-from wkoszek@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 2E21143D49
	for <perforce@FreeBSD.org>; Fri,  7 Jul 2006 15:23:08 +0000 (GMT)
	(envelope-from wkoszek@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 k67FN8ah030574
	for <perforce@FreeBSD.org>; Fri, 7 Jul 2006 15:23:08 GMT
	(envelope-from wkoszek@FreeBSD.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id k67FN7JS030571
	for perforce@freebsd.org; Fri, 7 Jul 2006 15:23:07 GMT
	(envelope-from wkoszek@FreeBSD.org)
Date: Fri, 7 Jul 2006 15:23:07 GMT
Message-Id: <200607071523.k67FN7JS030571@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	wkoszek@FreeBSD.org using -f
From: "Wojciech A. Koszek" <wkoszek@FreeBSD.org>
To: Perforce Change Reviews <perforce@FreeBSD.org>
Cc: 
Subject: PERFORCE change 100888 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Jul 2006 15:23:09 -0000

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

Change 100888 by wkoszek@wkoszek_laptop on 2006/07/07 15:22:38

	Enable CTASSERT from kern_proc.c because I've found a kinfo_proc
	size, which is 816 bytes when cross-compiled for MIPS.
	
	Change KINFO_PROC_SIZE to 816 in sys/sys/user.h, and change
	XXXMIPS->XXMIPS marker to leave a hint for people, who might have
	problemw with alignments later.

Affected files ...

.. //depot/projects/mips2/src/sys/kern/kern_proc.c#3 edit
.. //depot/projects/mips2/src/sys/sys/user.h#6 edit

Differences ...

==== //depot/projects/mips2/src/sys/kern/kern_proc.c#3 (text+ko) ====

@@ -100,13 +100,7 @@
 int kstack_pages = KSTACK_PAGES;
 SYSCTL_INT(_kern, OID_AUTO, kstack_pages, CTLFLAG_RD, &kstack_pages, 0, "");
 
-/*
- * XXXMIPS: Change this until we know what's going on with sizeof(struct
- * kinfo_proc).
- */
-#if 0
 CTASSERT(sizeof(struct kinfo_proc) == KINFO_PROC_SIZE);
-#endif
 
 /*
  * Initialize global process hashing structures.
@@ -114,7 +108,6 @@
 void
 procinit()
 {
-
 	sx_init(&allproc_lock, "allproc");
 	sx_init(&proctree_lock, "proctree");
 	mtx_init(&ppeers_lock, "p_peers", NULL, MTX_DEF);

==== //depot/projects/mips2/src/sys/sys/user.h#6 (text+ko) ====

@@ -95,10 +95,10 @@
 #define	KINFO_PROC_SIZE	768
 #endif
 /*
- * XXXMIPS: I'm not sure, but after cross-compiling my test-case I saw 768.
+ * XXMIPS: After defining a kinfo_proc variable, readelf shows 816.
  */
 #ifdef __mips__
-#define KINFO_PROC_SIZE 768
+#define KINFO_PROC_SIZE 816
 #endif
 #ifdef __powerpc__
 #define	KINFO_PROC_SIZE	768