PERFORCE change 32426 for review

[Peter Wemm]

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

Change 32426 by peter at peter_hammer on 2003/06/02 15:35:08

	IFC @32425

Affected files ...

.. //depot/projects/hammer/lib/Makefile#18 integrate
.. //depot/projects/hammer/lib/libc_r/arch/amd64/_atomic_lock.S#2 integrate
.. //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#9 integrate
.. //depot/projects/hammer/usr.sbin/Makefile#19 integrate

Differences ...

==== //depot/projects/hammer/lib/Makefile#18 (text+ko) ====

@@ -1,5 +1,5 @@
 #	@(#)Makefile	8.1 (Berkeley) 6/4/93
-# $FreeBSD: src/lib/Makefile,v 1.159 2003/06/01 00:32:21 marcel Exp $
+# $FreeBSD: src/lib/Makefile,v 1.160 2003/06/02 22:22:52 peter Exp $
 
 # To satisfy shared library or ELF linkage when only the libraries being
 # built are visible:

==== //depot/projects/hammer/lib/libc_r/arch/amd64/_atomic_lock.S#2 (text+ko) ====

@@ -22,7 +22,7 @@
 
 #if defined(LIBC_RCS) && !defined(lint)
 	.text
-	.asciz "$FreeBSD"
+	.asciz "$FreeBSD: src/lib/libc_r/arch/amd64/_atomic_lock.S,v 1.6 2003/06/02 22:30:59 peter Exp $"
 #endif /* LIBC_RCS and not lint */
 
 #include <machine/asm.h>

==== //depot/projects/hammer/lib/libc_r/uthread/pthread_private.h#9 (text+ko) ====

@@ -31,7 +31,7 @@
  *
  * Private thread definitions for the uthread kernel.
  *
- * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.79 2003/03/05 04:39:24 marcel Exp $
+ * $FreeBSD: src/lib/libc_r/uthread/pthread_private.h,v 1.80 2003/06/02 22:22:52 peter Exp $
  */
 
 #ifndef _PTHREAD_PRIVATE_H

==== //depot/projects/hammer/usr.sbin/Makefile#19 (text+ko) ====

@@ -1,5 +1,5 @@
 #	From: @(#)Makefile	5.20 (Berkeley) 6/12/93
-# $FreeBSD: src/usr.sbin/Makefile,v 1.254 2003/05/25 07:39:06 peter Exp $
+# $FreeBSD: src/usr.sbin/Makefile,v 1.255 2003/06/02 22:22:52 peter Exp $
 
 .if ${MACHINE_ARCH} != "powerpc"
 _sysinstall=sysinstall