svn commit: r209000 - stable/8/sys/dev/acpica

[John Baldwin]

Author: jhb
Date: Thu Jun 10 20:01:33 2010
New Revision: 209000
URL: http://svn.freebsd.org/changeset/base/209000

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

Modified:
  stable/8/sys/dev/acpica/acpi.c
Directory Properties:
  stable/8/sys/   (props changed)
  stable/8/sys/amd64/include/xen/   (props changed)
  stable/8/sys/cddl/contrib/opensolaris/   (props changed)
  stable/8/sys/contrib/dev/acpica/   (props changed)
  stable/8/sys/contrib/pf/   (props changed)
  stable/8/sys/dev/xen/xenpci/   (props changed)
  stable/8/sys/geom/sched/   (props changed)

Modified: stable/8/sys/dev/acpica/acpi.c
==============================================================================
--- stable/8/sys/dev/acpica/acpi.c	Thu Jun 10 19:59:23 2010	(r208999)
+++ stable/8/sys/dev/acpica/acpi.c	Thu Jun 10 20:01:33 2010	(r209000)
@@ -2356,7 +2356,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);
 	}
     }
 #endif