PERFORCE change 79263 for review

[Peter Wemm]

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

Change 79263 by peter at peter_overcee on 2005/06/30 07:56:26

	IFC @79262

Affected files ...

.. //depot/projects/hammer/sys/amd64/ia32/ia32_reg.c#7 integrate
.. //depot/projects/hammer/sys/compat/ia32/ia32_reg.h#3 integrate
.. //depot/projects/hammer/sys/conf/files.amd64#73 integrate
.. //depot/projects/hammer/sys/conf/files.ia64#31 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs_dbregs.c#8 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs_fpregs.c#8 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs_ioctl.c#10 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs_map.c#10 integrate
.. //depot/projects/hammer/sys/fs/procfs/procfs_regs.c#8 integrate
.. //depot/projects/hammer/sys/ia64/ia32/ia32_reg.c#3 integrate
.. //depot/projects/hammer/sys/kern/imgact_elf.c#31 integrate
.. //depot/projects/hammer/sys/kern/kern_clock.c#27 integrate
.. //depot/projects/hammer/sys/kern/sys_process.c#32 integrate
.. //depot/projects/hammer/sys/sys/ptrace.h#11 integrate

Differences ...

==== //depot/projects/hammer/sys/amd64/ia32/ia32_reg.c#7 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.1 2005/06/30 07:49:21 peter Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_reg.c,v 1.1 2005/06/30 07:49:21 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/exec.h>

==== //depot/projects/hammer/sys/compat/ia32/ia32_reg.h#3 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)reg.h	5.5 (Berkeley) 1/18/91
- * $FreeBSD$
+ * $FreeBSD: src/sys/compat/ia32/ia32_reg.h,v 1.1 2005/06/30 07:49:21 peter Exp $
  */
 
 #ifndef _COMPAT_IA32_IA32_REG_H_

==== //depot/projects/hammer/sys/conf/files.amd64#73 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.amd64,v 1.70 2005/06/30 05:33:25 peter Exp $
+# $FreeBSD: src/sys/conf/files.amd64,v 1.71 2005/06/30 07:49:21 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and

==== //depot/projects/hammer/sys/conf/files.ia64#31 (text+ko) ====

@@ -1,7 +1,7 @@
 # This file tells config what files go into building a kernel,
 # files marked standard are always included.
 #
-# $FreeBSD: src/sys/conf/files.ia64,v 1.80 2005/06/14 04:16:10 marcel Exp $
+# $FreeBSD: src/sys/conf/files.ia64,v 1.81 2005/06/30 07:49:21 peter Exp $
 #
 # The long compile-with and dependency lines are required because of
 # limitations in config: backslash-newline doesn't work in strings, and

==== //depot/projects/hammer/sys/fs/procfs/procfs_dbregs.c#8 (text+ko) ====

@@ -40,7 +40,7 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.25 2004/10/01 05:01:17 das Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs_dbregs.c,v 1.26 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/fs/procfs/procfs_fpregs.c#8 (text+ko) ====

@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.31 2004/10/01 05:01:17 das Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs_fpregs.c,v 1.32 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/fs/procfs/procfs_ioctl.c#10 (text+ko) ====

@@ -25,7 +25,7 @@
  * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  *
- *      $FreeBSD: src/sys/fs/procfs/procfs_ioctl.c,v 1.11 2005/06/30 00:19:08 peter Exp $
+ *      $FreeBSD: src/sys/fs/procfs/procfs_ioctl.c,v 1.12 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/fs/procfs/procfs_map.c#10 (text+ko) ====

@@ -32,7 +32,7 @@
  *
  *	@(#)procfs_status.c	8.3 (Berkeley) 2/17/94
  *
- * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.37 2005/01/06 18:10:40 imp Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs_map.c,v 1.38 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/fs/procfs/procfs_regs.c#8 (text+ko) ====

@@ -34,7 +34,7 @@
  *
  * From:
  *	$Id: procfs_regs.c,v 3.2 1993/12/15 09:40:17 jsp Exp $
- * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.30 2004/10/01 05:01:17 das Exp $
+ * $FreeBSD: src/sys/fs/procfs/procfs_regs.c,v 1.31 2005/06/30 07:49:21 peter Exp $
  */
 
 #include "opt_compat.h"

==== //depot/projects/hammer/sys/ia64/ia32/ia32_reg.c#3 (text+ko) ====

@@ -23,11 +23,11 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $FreeBSD$
+ * $FreeBSD: src/sys/ia64/ia32/ia32_reg.c,v 1.1 2005/06/30 07:49:22 peter Exp $
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD$");
+__FBSDID("$FreeBSD: src/sys/ia64/ia32/ia32_reg.c,v 1.1 2005/06/30 07:49:22 peter Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>

==== //depot/projects/hammer/sys/kern/imgact_elf.c#31 (text+ko) ====

@@ -29,7 +29,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.161 2005/05/24 22:21:44 cognet Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/imgact_elf.c,v 1.162 2005/06/30 07:49:22 peter Exp $");
 
 #include "opt_compat.h"
 

==== //depot/projects/hammer/sys/kern/kern_clock.c#27 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.176 2005/06/24 00:16:57 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_clock.c,v 1.177 2005/06/30 07:49:22 peter Exp $");
 
 #include "opt_compat.h"
 #include "opt_hwpmc_hooks.h"

==== //depot/projects/hammer/sys/kern/sys_process.c#32 (text+ko) ====

@@ -30,7 +30,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/sys_process.c,v 1.130 2005/03/18 21:22:28 das Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/sys_process.c,v 1.131 2005/06/30 07:49:22 peter Exp $");
 
 #include "opt_compat.h"
 

==== //depot/projects/hammer/sys/sys/ptrace.h#11 (text+ko) ====

@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)ptrace.h	8.2 (Berkeley) 1/4/94
- * $FreeBSD: src/sys/sys/ptrace.h,v 1.26 2005/04/29 22:38:02 cperciva Exp $
+ * $FreeBSD: src/sys/sys/ptrace.h,v 1.27 2005/06/30 07:49:22 peter Exp $
  */
 
 #ifndef	_SYS_PTRACE_H_