CVS commit: src/sys/dev/acpi

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Fri Aug  5 02:29:54 UTC 2011

Modified Files:
        src/sys/dev/acpi: acpi_cpu_cstate.c

Log Message:
relax an assert slightly, from jmcneill.


To generate a diff of this commit:
cvs rdiff -u -r1.55 -r1.56 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.55 src/sys/dev/acpi/acpi_cpu_cstate.c:1.56
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.55	Thu Aug  4 23:22:30 2011
+++ src/sys/dev/acpi/acpi_cpu_cstate.c	Fri Aug  5 02:29:53 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.55 2011/08/04 23:22:30 jmcneill Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.56 2011/08/05 02:29:53 mrg Exp $ */
 
 /*-
  * Copyright (c) 2010, 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.55 2011/08/04 23:22:30 jmcneill Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.56 2011/08/05 02:29:53 mrg Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -377,7 +377,7 @@
 		goto out;
 	}
 
-	KASSERT(cs[type].cs_method == 0);
+	KASSERT(type == ACPI_STATE_C1 || cs[type].cs_method == 0);
 
 	cs[type].cs_addr = state.cs_addr;
 	cs[type].cs_power = state.cs_power;