From owner-svn-src-stable-7@FreeBSD.ORG  Thu Jun 10 20:02:13 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 6222C1065678;
	Thu, 10 Jun 2010 20:02:13 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (unknown [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 50D358FC1B;
	Thu, 10 Jun 2010 20:02:13 +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 o5AK2DMF050459;
	Thu, 10 Jun 2010 20:02:13 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o5AK2D3V050457;
	Thu, 10 Jun 2010 20:02:13 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201006102002.o5AK2D3V050457@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Thu, 10 Jun 2010 20:02:13 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r209001 - stable/7/sys/dev/acpica
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 10 Jun 2010 20:02:13 -0000

Author: jhb
Date: Thu Jun 10 20:02:13 2010
New Revision: 209001
URL: http://svn.freebsd.org/changeset/base/209001

Log:
  MFC 208925:
  The lock associated with the /dev/apm knote is already held, so use
  KNOTE_LOCKED() instead of KNOTE_UNLOCKED().

Modified:
  stable/7/sys/dev/acpica/acpi.c
Directory Properties:
  stable/7/sys/   (props changed)
  stable/7/sys/cddl/contrib/opensolaris/   (props changed)
  stable/7/sys/contrib/dev/acpica/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)

Modified: stable/7/sys/dev/acpica/acpi.c
==============================================================================
--- stable/7/sys/dev/acpica/acpi.c	Thu Jun 10 20:01:33 2010	(r209000)
+++ stable/7/sys/dev/acpica/acpi.c	Thu Jun 10 20:02:13 2010	(r209001)
@@ -2258,7 +2258,7 @@ acpi_ReqSleepState(struct acpi_softc *sc
 	clone->notify_status = APM_EV_NONE;
 	if ((clone->flags & ACPI_EVF_DEVD) == 0) {
 	    selwakeuppri(&clone->sel_read, PZERO);
-	    KNOTE_UNLOCKED(&clone->sel_read.si_note, 0);
+	    KNOTE_LOCKED(&clone->sel_read.si_note, 0);
 	}
     }