[src/trunk]: src/sys/dev/scsipi Fix KASSERT(): autoconf doesn't run under the...

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

details:   https://anonhg.NetBSD.org/src/rev/e408d20b9265
branches:  trunk
changeset: 778885:e408d20b9265
user:      bouyer <bouyer%NetBSD.org@localhost>
date:      Wed Apr 18 20:37:49 2012 +0000

description:
Fix KASSERT(): autoconf doesn't run under the KERNEL_LOCK

diffstat:

 sys/dev/scsipi/scsipi_base.c |  8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r d243189c2427 -r e408d20b9265 sys/dev/scsipi/scsipi_base.c
--- a/sys/dev/scsipi/scsipi_base.c      Wed Apr 18 19:30:15 2012 +0000
+++ b/sys/dev/scsipi/scsipi_base.c      Wed Apr 18 20:37:49 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: scsipi_base.c,v 1.156 2012/02/20 20:09:08 mrg Exp $    */
+/*     $NetBSD: scsipi_base.c,v 1.157 2012/04/18 20:37:49 bouyer Exp $ */
 
 /*-
  * Copyright (c) 1998, 1999, 2000, 2002, 2003, 2004 The NetBSD Foundation, Inc.
@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.156 2012/02/20 20:09:08 mrg Exp $");
+__KERNEL_RCSID(0, "$NetBSD: scsipi_base.c,v 1.157 2012/04/18 20:37:49 bouyer Exp $");
 
 #include "opt_scsi.h"
 
@@ -218,7 +218,7 @@
        uint32_t hash;
        int s;
 
-       KASSERT(KERNEL_LOCKED_P());
+       KASSERT(cold || KERNEL_LOCKED_P());
 
        if (target >= chan->chan_ntargets ||
            lun >= chan->chan_nluns)
@@ -1263,7 +1263,7 @@
        struct scsipi_channel *chan = periph->periph_channel;
        int s, freezecnt;
 
-       KASSERT(KERNEL_LOCKED_P());
+       KASSERT(cold || KERNEL_LOCKED_P());
 
        SC_DEBUG(periph, SCSIPI_DB2, ("scsipi_done\n"));
 #ifdef SCSIPI_DEBUG