svn commit: r239809 - stable/9/sys/dev/acpica

[Andriy Gapon]

Author: avg
Date: Wed Aug 29 08:39:58 2012
New Revision: 239809
URL: http://svn.freebsd.org/changeset/base/239809

Log:
  MFC r238192: acpi_cpu_cx_cst: consistently use cpu_cx_count during state
  enumeration

Modified:
  stable/9/sys/dev/acpica/acpi_cpu.c
Directory Properties:
  stable/9/sys/   (props changed)
  stable/9/sys/dev/   (props changed)

Modified: stable/9/sys/dev/acpica/acpi_cpu.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_cpu.c	Wed Aug 29 08:34:16 2012	(r239808)
+++ stable/9/sys/dev/acpica/acpi_cpu.c	Wed Aug 29 08:39:58 2012	(r239809)
@@ -747,13 +747,13 @@ acpi_cpu_cx_cst(struct acpi_cpu_softc *s
 		/* This is the first C1 state.  Use the reserved slot. */
 		sc->cpu_cx_states[0] = *cx_ptr;
 	    } else {
-		sc->cpu_non_c3 = i;
+		sc->cpu_non_c3 = sc->cpu_cx_count;
 		cx_ptr++;
 		sc->cpu_cx_count++;
 	    }
 	    continue;
 	case ACPI_STATE_C2:
-	    sc->cpu_non_c3 = i;
+	    sc->cpu_non_c3 = sc->cpu_cx_count;
 	    break;
 	case ACPI_STATE_C3:
 	default: