Module Name: src
Committed By: riz
Date: Mon Feb 27 20:11:56 UTC 2012
Modified Files:
src/sys/dev/acpi [netbsd-6]: acpi_cpu_cstate.c
Log Message:
Pull up following revision(s) (requested by jruoho in ticket #51):
sys/dev/acpi/acpi_cpu_cstate.c: revision 1.59
Set the flag for checking for PCI bus master activity only for C3.
To generate a diff of this commit:
cvs rdiff -u -r1.58 -r1.58.8.1 src/sys/dev/acpi/acpi_cpu_cstate.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_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.58 src/sys/dev/acpi/acpi_cpu_cstate.c:1.58.8.1
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.58 Thu Oct 13 05:20:45 2011
+++ src/sys/dev/acpi/acpi_cpu_cstate.c Mon Feb 27 20:11:56 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.58 2011/10/13 05:20:45 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.58.8.1 2012/02/27 20:11:56 riz Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen <[email protected]>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.58 2011/10/13 05:20:45 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.58.8.1 2012/02/27 20:11:56 riz Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -243,8 +243,6 @@ acpicpu_cstate_cst_add(struct acpicpu_so
(void)memset(&state, 0, sizeof(*cs));
- state.cs_flags = ACPICPU_FLAG_C_BM_STS;
-
if (elm->Type != ACPI_TYPE_PACKAGE) {
rv = AE_TYPE;
goto out;
@@ -350,6 +348,9 @@ acpicpu_cstate_cst_add(struct acpicpu_so
break;
+ case ACPI_STATE_C3: /* FALLTHROUGH */
+ state.cs_flags = ACPICPU_FLAG_C_BM_STS;
+
default:
if ((sc->sc_flags & ACPICPU_FLAG_C_FFH) == 0) {
