Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/dev/acpi build fix: first initialize sc then KASSERT



details:   https://anonhg.NetBSD.org/src/rev/6000b45215df
branches:  trunk
changeset: 757175:6000b45215df
user:      cegger <cegger%NetBSD.org@localhost>
date:      Tue Aug 17 18:49:28 2010 +0000

description:
build fix: first initialize sc then KASSERT

diffstat:

 sys/dev/acpi/acpi_cpu_cstate.c |  6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diffs (29 lines):

diff -r b1e9369090a4 -r 6000b45215df sys/dev/acpi/acpi_cpu_cstate.c
--- a/sys/dev/acpi/acpi_cpu_cstate.c    Tue Aug 17 15:51:11 2010 +0000
+++ b/sys/dev/acpi/acpi_cpu_cstate.c    Tue Aug 17 18:49:28 2010 +0000
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.29 2010/08/16 17:58:42 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.30 2010/08/17 18:49:28 cegger Exp $ */
 
 /*-
  * Copyright (c) 2010 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.29 2010/08/16 17:58:42 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.30 2010/08/17 18:49:28 cegger Exp $");
 
 #include <sys/param.h>
 #include <sys/cpu.h>
@@ -665,9 +665,9 @@
        KASSERT(acpicpu_sc != NULL);
        KASSERT(ci->ci_acpiid < maxcpus);
        KASSERT(ci->ci_ilevel == IPL_NONE);
-       KASSERT((sc->sc_flags & ACPICPU_FLAG_C) != 0);
 
        sc = acpicpu_sc[ci->ci_acpiid];
+       KASSERT((sc->sc_flags & ACPICPU_FLAG_C) != 0);
 
        if (__predict_false(sc == NULL))
                goto halt;



Home | Main Index | Thread Index | Old Index