CVS commit: src/sys/dev/acpi

[Jukka Ruohonen]

Module Name:    src
Committed By:   jruoho
Date:           Tue Aug 17 10:57:31 UTC 2010

Modified Files:
        src/sys/dev/acpi: acpi_cpu_pstate.c acpi_cpu_tstate.c

Log Message:
Adjust locking for previous.


To generate a diff of this commit:
cvs rdiff -u -r1.28 -r1.29 src/sys/dev/acpi/acpi_cpu_pstate.c
cvs rdiff -u -r1.13 -r1.14 src/sys/dev/acpi/acpi_cpu_tstate.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.


Modified files:

Index: src/sys/dev/acpi/acpi_cpu_pstate.c
diff -u src/sys/dev/acpi/acpi_cpu_pstate.c:1.28 src/sys/dev/acpi/acpi_cpu_pstate.c:1.29
--- src/sys/dev/acpi/acpi_cpu_pstate.c:1.28	Tue Aug 17 10:35:22 2010
+++ src/sys/dev/acpi/acpi_cpu_pstate.c	Tue Aug 17 10:57:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_pstate.c,v 1.28 2010/08/17 10:35:22 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_pstate.c,v 1.29 2010/08/17 10:57:30 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.28 2010/08/17 10:35:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.29 2010/08/17 10:57:30 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -57,7 +57,7 @@
 static void		 acpicpu_pstate_reset(struct acpicpu_softc *);
 static void		 acpicpu_pstate_bios(void);
 
-static uint32_t		 acpicpu_pstate_saved;
+static uint32_t		 acpicpu_pstate_saved = 0;
 
 void
 acpicpu_pstate_attach(device_t self)
@@ -273,7 +273,9 @@
 	struct acpicpu_pstate *ps = NULL;
 	int32_t i;
 
+	mutex_enter(&sc->sc_mtx);
 	acpicpu_pstate_reset(sc);
+	mutex_exit(&sc->sc_mtx);
 
 	if (acpicpu_pstate_saved != 0)
 		return true;

Index: src/sys/dev/acpi/acpi_cpu_tstate.c
diff -u src/sys/dev/acpi/acpi_cpu_tstate.c:1.13 src/sys/dev/acpi/acpi_cpu_tstate.c:1.14
--- src/sys/dev/acpi/acpi_cpu_tstate.c:1.13	Tue Aug 17 10:35:22 2010
+++ src/sys/dev/acpi/acpi_cpu_tstate.c	Tue Aug 17 10:57:30 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_tstate.c,v 1.13 2010/08/17 10:35:22 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_tstate.c,v 1.14 2010/08/17 10:57:30 jruoho Exp $ */
 
 /*-
  * Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.13 2010/08/17 10:35:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_tstate.c,v 1.14 2010/08/17 10:57:30 jruoho Exp $");
 
 #include <sys/param.h>
 #include <sys/evcnt.h>
@@ -209,7 +209,9 @@
 {
 	struct acpicpu_softc *sc = device_private(self);
 
+	mutex_enter(&sc->sc_mtx);
 	acpicpu_tstate_reset(sc);
+	mutex_exit(&sc->sc_mtx);
 
 	return true;
 }