From owner-svn-src-all@FreeBSD.ORG  Tue Jun  8 21:27:05 2010
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 D8A8F1065672;
	Tue,  8 Jun 2010 21:27:05 +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 C7E048FC12;
	Tue,  8 Jun 2010 21:27:05 +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 o58LR57P018922;
	Tue, 8 Jun 2010 21:27:05 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o58LR5Vq018920;
	Tue, 8 Jun 2010 21:27:05 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201006082127.o58LR5Vq018920@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 8 Jun 2010 21:27:05 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r208925 - head/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: Tue, 08 Jun 2010 21:27:05 -0000

Author: jhb
Date: Tue Jun  8 21:27:05 2010
New Revision: 208925
URL: http://svn.freebsd.org/changeset/base/208925

Log:
  The lock associated with the /dev/apm knote is already held, so use
  KNOTE_LOCKED() instead of KNOTE_UNLOCKED().
  
  Reported by:	mav
  MFC after:	3 days

Modified:
  head/sys/dev/acpica/acpi.c

Modified: head/sys/dev/acpica/acpi.c
==============================================================================
--- head/sys/dev/acpica/acpi.c	Tue Jun  8 19:36:41 2010	(r208924)
+++ head/sys/dev/acpica/acpi.c	Tue Jun  8 21:27:05 2010	(r208925)
@@ -2346,7 +2346,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);
 	}
     }