From owner-svn-src-head@FreeBSD.ORG  Sat Oct 25 20:42:48 2014
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id 822F0594;
 Sat, 25 Oct 2014 20:42:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 6F13B888;
 Sat, 25 Oct 2014 20:42:48 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
 by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s9PKgmKJ013213;
 Sat, 25 Oct 2014 20:42:48 GMT (envelope-from jhb@FreeBSD.org)
Received: (from jhb@localhost)
 by svn.freebsd.org (8.14.9/8.14.9/Submit) id s9PKgm8h013212;
 Sat, 25 Oct 2014 20:42:48 GMT (envelope-from jhb@FreeBSD.org)
Message-Id: <201410252042.s9PKgm8h013212@svn.freebsd.org>
X-Authentication-Warning: svn.freebsd.org: jhb set sender to jhb@FreeBSD.org
 using -f
From: John Baldwin <jhb@FreeBSD.org>
Date: Sat, 25 Oct 2014 20:42:48 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r273646 - head/sys/kern
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.18-1
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 25 Oct 2014 20:42:48 -0000

Author: jhb
Date: Sat Oct 25 20:42:47 2014
New Revision: 273646
URL: https://svnweb.freebsd.org/changeset/base/273646

Log:
  Use correct type in __DEVOLATILE().

Modified:
  head/sys/kern/kern_umtx.c

Modified: head/sys/kern/kern_umtx.c
==============================================================================
--- head/sys/kern/kern_umtx.c	Sat Oct 25 20:34:10 2014	(r273645)
+++ head/sys/kern/kern_umtx.c	Sat Oct 25 20:42:47 2014	(r273646)
@@ -2895,7 +2895,8 @@ do_sem2_wake(struct thread *td, struct _
 		 */
 		if (cnt == 1) {
 			umtxq_unlock(&key);
-			count = fuword32(__DEVOLATILE(void *, &sem->_count));
+			count = fuword32(__DEVOLATILE(uint32_t *,
+			    &sem->_count));
 			while (count != -1 && count & USEM_HAS_WAITERS)
 				count = casuword32(&sem->_count, count,
 				    count & ~USEM_HAS_WAITERS);