From owner-svn-src-all@FreeBSD.ORG  Thu Jan  6 18:00:34 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8956E106566C;
	Thu,  6 Jan 2011 18:00:34 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 788A38FC17;
	Thu,  6 Jan 2011 18:00:34 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p06I0Yj4023868;
	Thu, 6 Jan 2011 18:00:34 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p06I0YAK023866;
	Thu, 6 Jan 2011 18:00:34 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <201101061800.p06I0YAK023866@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Thu, 6 Jan 2011 18:00:34 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r217059 - releng/8.2/sys/dev/acpica
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 06 Jan 2011 18:00:34 -0000

Author: jkim
Date: Thu Jan  6 18:00:34 2011
New Revision: 217059
URL: http://svn.freebsd.org/changeset/base/217059

Log:
  MFC:	r216940
  
  Fix parameters for wakeup(9) and tsleep(9).
  
  Approved by:	re (kib)

Modified:
  releng/8.2/sys/dev/acpica/acpi_ec.c
Directory Properties:
  releng/8.2/sys/   (props changed)
  releng/8.2/sys/amd64/include/xen/   (props changed)
  releng/8.2/sys/cddl/contrib/opensolaris/   (props changed)
  releng/8.2/sys/contrib/dev/acpica/   (props changed)
  releng/8.2/sys/contrib/pf/   (props changed)

Modified: releng/8.2/sys/dev/acpica/acpi_ec.c
==============================================================================
--- releng/8.2/sys/dev/acpica/acpi_ec.c	Thu Jan  6 17:28:31 2011	(r217058)
+++ releng/8.2/sys/dev/acpica/acpi_ec.c	Thu Jan  6 18:00:34 2011	(r217059)
@@ -707,7 +707,7 @@ EcGpeHandler(void *Context)
      * address and then data values.)
      */
     atomic_add_int(&sc->ec_gencount, 1);
-    wakeup(&sc);
+    wakeup(sc);
 
     /*
      * If the EC_SCI bit of the status register is set, queue a query handler.
@@ -858,7 +858,7 @@ EcWaitEvent(struct acpi_ec_softc *sc, EC
 	 */
 	for (i = 0; i < count; i++) {
 	    if (gen_count == sc->ec_gencount)
-		tsleep(&sc, 0, "ecgpe", slp_ival);
+		tsleep(sc, 0, "ecgpe", slp_ival);
 	    /*
 	     * Record new generation count.  It's possible the GPE was
 	     * just to notify us that a query is needed and we need to