Source-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[src/trunk]: src/sys/dev/acpi relax an assert slightly, from jmcneill.
details: https://anonhg.NetBSD.org/src/rev/1496b150fb4b
branches: trunk
changeset: 767975:1496b150fb4b
user: mrg <mrg%NetBSD.org@localhost>
date: Fri Aug 05 02:29:53 2011 +0000
description:
relax an assert slightly, from jmcneill.
diffstat:
sys/dev/acpi/acpi_cpu_cstate.c | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diffs (27 lines):
diff -r 59a576c3ea03 -r 1496b150fb4b sys/dev/acpi/acpi_cpu_cstate.c
--- a/sys/dev/acpi/acpi_cpu_cstate.c Fri Aug 05 02:00:25 2011 +0000
+++ b/sys/dev/acpi/acpi_cpu_cstate.c Fri Aug 05 02:29:53 2011 +0000
@@ -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 <jruohonen%iki.fi@localhost>
@@ -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;
Home |
Main Index |
Thread Index |
Old Index