svn commit: r191002 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb kern

[David Xu]

Author: davidxu
Date: Mon Apr 13 14:25:36 2009
New Revision: 191002
URL: http://svn.freebsd.org/changeset/base/191002

Log:
  MFC r190987 from head to stable/7:
  
      Make UMTX_OP_WAIT_UINT actually wait for an unsigned integer on 64-bits
      machine.
  
  Approved by:    re (kib)

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/kern/kern_umtx.c

Modified: stable/7/sys/kern/kern_umtx.c
==============================================================================
--- stable/7/sys/kern/kern_umtx.c	Mon Apr 13 14:15:36 2009	(r191001)
+++ stable/7/sys/kern/kern_umtx.c	Mon Apr 13 14:25:36 2009	(r191002)
@@ -975,7 +975,7 @@ do_wait(struct thread *td, void *addr, u
 	if (compat32 == 0)
 		tmp = fuword(addr);
         else
-		tmp = fuword32(addr);
+		tmp = (unsigned int)fuword32(addr);
 	if (tmp != id) {
 		umtxq_lock(&uq->uq_key);
 		umtxq_remove(uq);