PERFORCE change 55355 for review

[Marcel Moolenaar]

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

Change 55355 by marcel at marcel_nfs on 2004/06/20 03:42:03

	IFC @55354

Affected files ...

.. //depot/projects/gdb/gnu/usr.bin/binutils/ld/Makefile#4 integrate
.. //depot/projects/gdb/sys/gnu/ext2fs/ext2_mount.h#4 integrate
.. //depot/projects/gdb/sys/gnu/ext2fs/inode.h#4 integrate
.. //depot/projects/gdb/sys/i386/include/pmap.h#8 integrate
.. //depot/projects/gdb/sys/kern/kern_proc.c#11 integrate
.. //depot/projects/gdb/sys/ufs/ufs/dinode.h#3 integrate

Differences ...

==== //depot/projects/gdb/gnu/usr.bin/binutils/ld/Makefile#4 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.28 2004/06/16 07:09:37 obrien Exp $
+# $FreeBSD: src/gnu/usr.bin/binutils/ld/Makefile,v 1.29 2004/06/20 01:44:58 obrien Exp $
 
 .include "../Makefile.inc0"
 
@@ -13,8 +13,8 @@
 WARNS?=	0	# ldemul.h problem (`struct option' declared inside parameter list)
 CFLAGS+= -DSCRIPTDIR=\"${TOOLS_PREFIX}/usr/libdata\"
 CFLAGS+= -DBFD_VERSION_STRING=\"${VERSION}\"
-CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${DESTDIR}\"
-CFLAGS+= -DTOOLBINDIR=\"${DESTDIR}/${BINDIR}/libexec\"
+CFLAGS+= -DBINDIR=\"${BINDIR}\" -DTARGET_SYSTEM_ROOT=\"${TOOLS_PREFIX}\"
+CFLAGS+= -DTOOLBINDIR=\"${TOOLS_PREFIX}/${BINDIR}/libexec\"
 CFLAGS+= -D_GNU_SOURCE
 CFLAGS+= -I${SRCDIR}/ld -I${SRCDIR}/bfd
 NOSHARED?= yes

==== //depot/projects/gdb/sys/gnu/ext2fs/ext2_mount.h#4 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ufsmount.h	8.6 (Berkeley) 3/30/95
- * $FreeBSD: src/sys/gnu/ext2fs/ext2_mount.h,v 1.27 2004/06/16 09:47:06 phk Exp $
+ * $FreeBSD: src/sys/gnu/ext2fs/ext2_mount.h,v 1.28 2004/06/20 03:34:21 bde Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_EXT2_MOUNT_H_
@@ -44,7 +44,7 @@
 /* This structure describes the ext2fs specific mount structure data. */
 struct ext2mount {
 	struct	mount *um_mountp;		/* filesystem vfs structure */
-	struct cdev *um_dev;				/* device mounted */
+	struct	cdev *um_dev;			/* device mounted */
 	struct	vnode *um_devvp;		/* block device mounted vnode */
 
 	struct	ext2_sb_info *um_e2fs;		/* EXT2FS */

==== //depot/projects/gdb/sys/gnu/ext2fs/inode.h#4 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)inode.h	8.9 (Berkeley) 5/14/95
- * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.40 2004/06/16 09:47:06 phk Exp $
+ * $FreeBSD: src/sys/gnu/ext2fs/inode.h,v 1.41 2004/06/20 03:36:31 bde Exp $
  */
 
 #ifndef _SYS_GNU_EXT2FS_INODE_H_
@@ -65,7 +65,7 @@
 	struct	vnode  *i_vnode;/* Vnode associated with this inode. */
 	struct	vnode  *i_devvp;/* Vnode for block I/O. */
 	u_int32_t i_flag;	/* flags, see below */
-	struct cdev *i_dev;	/* Device associated with the inode. */
+	struct	cdev *i_dev;	/* Device associated with the inode. */
 	ino_t	  i_number;	/* The identity of the inode. */
 
 	struct	ext2_sb_info *i_e2fs;	/* EXT2FS */
@@ -110,7 +110,7 @@
  * The di_db fields may be overlaid with other information for
  * file types that do not have associated disk storage. Block
  * and character devices overlay the first data block with their
- * struct cdev *value. Short symbolic links place their path in the
+ * dev_t value. Short symbolic links place their path in the
  * di_db area.
  */
 #define	i_shortlink	i_db

==== //depot/projects/gdb/sys/i386/include/pmap.h#8 (text+ko) ====

@@ -38,7 +38,7 @@
  *
  *	from: hp300: @(#)pmap.h	7.2 (Berkeley) 12/16/90
  *	from: @(#)pmap.h	7.4 (Berkeley) 5/12/91
- * $FreeBSD: src/sys/i386/include/pmap.h,v 1.110 2004/06/16 07:03:15 alc Exp $
+ * $FreeBSD: src/sys/i386/include/pmap.h,v 1.111 2004/06/20 00:33:14 bde Exp $
  */
 
 #ifndef _MACHINE_PMAP_H_
@@ -135,9 +135,9 @@
 
 #ifndef LOCORE
 
+#include <sys/queue.h>
 #include <sys/_lock.h>
 #include <sys/_mutex.h>
-#include <sys/queue.h>
 
 #ifdef PAE
 

==== //depot/projects/gdb/sys/kern/kern_proc.c#11 (text+ko) ====

@@ -27,11 +27,11 @@
  * SUCH DAMAGE.
  *
  *	@(#)kern_proc.c	8.7 (Berkeley) 2/14/95
- * $FreeBSD: src/sys/kern/kern_proc.c,v 1.209 2004/06/19 14:09:40 gad Exp $
+ * $FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.209 2004/06/19 14:09:40 gad Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_proc.c,v 1.210 2004/06/20 02:03:33 gad Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_kstack_pages.h"
@@ -694,6 +694,8 @@
 		kp->ki_start = p->p_stats->p_start;
 		timevaladd(&kp->ki_start, &boottime);
 		kp->ki_rusage = p->p_stats->p_ru;
+		calcru(p, &kp->ki_rusage.ru_utime, &kp->ki_rusage.ru_stime,
+		    NULL);
 		kp->ki_childstime = p->p_stats->p_cru.ru_stime;
 		kp->ki_childutime = p->p_stats->p_cru.ru_utime;
 		/* Some callers want child-times in a single value */

==== //depot/projects/gdb/sys/ufs/ufs/dinode.h#3 (text+ko) ====

@@ -41,7 +41,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)dinode.h	8.3 (Berkeley) 1/21/94
- * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.12 2004/06/16 09:47:25 phk Exp $
+ * $FreeBSD: src/sys/ufs/ufs/dinode.h,v 1.13 2004/06/20 03:11:19 bde Exp $
  */
 
 #ifndef _UFS_UFS_DINODE_H_
@@ -131,7 +131,7 @@
  * The di_db fields may be overlaid with other information for
  * file types that do not have associated disk storage. Block
  * and character devices overlay the first data block with their
- * struct cdev *value. Short symbolic links place their path in the
+ * dev_t value. Short symbolic links place their path in the
  * di_db area.
  */
 #define	di_rdev di_db[0]