[src/netbsd-6]: src/sys/dev/acpi Pull up following revision(s) (requested by ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/a713395e060a
branches:  netbsd-6
changeset: 773836:a713395e060a
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Feb 27 20:11:56 2012 +0000

description:
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.

diffstat:

 sys/dev/acpi/acpi_cpu_cstate.c |  9 +++++----
 1 files changed, 5 insertions(+), 4 deletions(-)

diffs (37 lines):

diff -r 8d88835af646 -r a713395e060a sys/dev/acpi/acpi_cpu_cstate.c
--- a/sys/dev/acpi/acpi_cpu_cstate.c    Sat Feb 25 21:39:44 2012 +0000
+++ b/sys/dev/acpi/acpi_cpu_cstate.c    Mon Feb 27 20:11:56 2012 +0000
@@ -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 <jruohonen%iki.fi@localhost>
@@ -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 @@
 
        (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 @@
 
                        break;
 
+               case ACPI_STATE_C3: /* FALLTHROUGH */
+                       state.cs_flags = ACPICPU_FLAG_C_BM_STS;
+
                default:
 
                        if ((sc->sc_flags & ACPICPU_FLAG_C_FFH) == 0) {