Index: stable/7/sys/boot/forth/support.4th
===================================================================
--- stable/7/sys/boot/forth/support.4th	(revision 180570)
+++ stable/7/sys/boot/forth/support.4th	(revision 180571)

Property changes on: stable/7/sys/boot/forth/support.4th
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/boot/forth/support.4th:r180032
Index: stable/7/sys/conf
===================================================================
--- stable/7/sys/conf	(revision 180570)
+++ stable/7/sys/conf	(revision 180571)

Property changes on: stable/7/sys/conf
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/conf:r180032
Index: stable/7/sys/dev/gem
===================================================================
--- stable/7/sys/dev/gem	(revision 180570)
+++ stable/7/sys/dev/gem	(revision 180571)

Property changes on: stable/7/sys/dev/gem
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/dev/gem:r180032
Index: stable/7/sys/dev/mfi
===================================================================
--- stable/7/sys/dev/mfi	(revision 180570)
+++ stable/7/sys/dev/mfi	(revision 180571)

Property changes on: stable/7/sys/dev/mfi
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/dev/mfi:r180032
Index: stable/7/sys/geom/part
===================================================================
--- stable/7/sys/geom/part	(revision 180570)
+++ stable/7/sys/geom/part	(revision 180571)

Property changes on: stable/7/sys/geom/part
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/geom/part:r180032
Index: stable/7/sys/kern
===================================================================
--- stable/7/sys/kern	(revision 180570)
+++ stable/7/sys/kern	(revision 180571)

Property changes on: stable/7/sys/kern
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/kern:r180032
Index: stable/7/sys/modules/geom/geom_part
===================================================================
--- stable/7/sys/modules/geom/geom_part	(revision 180570)
+++ stable/7/sys/modules/geom/geom_part	(revision 180571)

Property changes on: stable/7/sys/modules/geom/geom_part
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/modules/geom/geom_part:r180032
Index: stable/7/sys/nlm
===================================================================
--- stable/7/sys/nlm	(revision 180570)
+++ stable/7/sys/nlm	(revision 180571)

Property changes on: stable/7/sys/nlm
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/nlm:r180032
Index: stable/7/sys/pci
===================================================================
--- stable/7/sys/pci	(revision 180570)
+++ stable/7/sys/pci	(revision 180571)

Property changes on: stable/7/sys/pci
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/pci:r180032
Index: stable/7/sys/powerpc/include/atomic.h
===================================================================
--- stable/7/sys/powerpc/include/atomic.h	(revision 180570)
+++ stable/7/sys/powerpc/include/atomic.h	(revision 180571)

Property changes on: stable/7/sys/powerpc/include/atomic.h
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys/powerpc/include/atomic.h:r180032
Index: stable/7/sys/sys/semaphore.h
===================================================================
--- stable/7/sys/sys/semaphore.h	(revision 180570)
+++ stable/7/sys/sys/semaphore.h	(revision 180571)
@@ -1,67 +1,69 @@
 /*-
  * Copyright (c) 1996, 1997
  *	HD Associates, Inc.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
  * 3. All advertising materials mentioning features or use of this software
  *    must display the following acknowledgement:
  *	This product includes software developed by HD Associates, Inc
  * 4. Neither the name of the author nor the names of any co-contributors
  *    may be used to endorse or promote products derived from this software
  *    without specific prior written permission.
  *
  * THIS SOFTWARE IS PROVIDED BY HD ASSOCIATES AND CONTRIBUTORS ``AS IS'' AND
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL HD ASSOCIATES OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (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$
  */
 
 /* semaphore.h: POSIX 1003.1b semaphores */
 
 #ifndef _SEMAPHORE_H_
 #define _SEMAPHORE_H_
 
+#include <machine/_limits.h>
+
 /* Opaque type definition. */
 struct sem;
 typedef	struct sem *	sem_t;
 
 #define	SEM_FAILED	((sem_t *)0)
-#define	SEM_VALUE_MAX	(~0U)		/* Equivalent to UINT_MAX. */
+#define	SEM_VALUE_MAX	__INT_MAX
 
 #ifndef _KERNEL
 #include <sys/cdefs.h>
 
 struct timespec;
 
 __BEGIN_DECLS
 int	 sem_close(sem_t *);
 int	 sem_destroy(sem_t *);
 int	 sem_getvalue(sem_t * __restrict, int * __restrict);
 int	 sem_init(sem_t *, int, unsigned int);
 sem_t	*sem_open(const char *, int, ...);
 int	 sem_post(sem_t *);
 int	 sem_timedwait(sem_t * __restrict, const struct timespec * __restrict);
 int	 sem_trywait(sem_t *);
 int	 sem_unlink(const char *);
 int	 sem_wait(sem_t *);
 __END_DECLS
 
 #endif
 
 #endif /* !_SEMAPHORE_H_ */
Index: stable/7/sys
===================================================================
--- stable/7/sys	(revision 180570)
+++ stable/7/sys	(revision 180571)

Property changes on: stable/7/sys
___________________________________________________________________
Modified: svn:mergeinfo
## -0,0 +0,1 ##
   Merged /head/sys:r180032