[src/netbsd-6]: src/sys/dev/scsipi Pull up following revision(s) (requested b...

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

details:   https://anonhg.NetBSD.org/src/rev/bc68366930b4
branches:  netbsd-6
changeset: 773990:bc68366930b4
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Apr 09 17:54:20 2012 +0000

description:
Pull up following revision(s) (requested by chs in ticket #166):
        sys/dev/scsipi/atapiconf.c: revision 1.84
take the kernel lock during detach of atapibus as well.

diffstat:

 sys/dev/scsipi/atapiconf.c |  10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diffs (38 lines):

diff -r f47ba80ae31c -r bc68366930b4 sys/dev/scsipi/atapiconf.c
--- a/sys/dev/scsipi/atapiconf.c        Mon Apr 09 17:51:44 2012 +0000
+++ b/sys/dev/scsipi/atapiconf.c        Mon Apr 09 17:54:20 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: atapiconf.c,v 1.83 2010/06/07 01:41:39 pgoyette Exp $  */
+/*     $NetBSD: atapiconf.c,v 1.83.14.1 2012/04/09 17:54:20 riz Exp $  */
 
 /*
  * Copyright (c) 1996, 2001 Manuel Bouyer.  All rights reserved.
@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.83 2010/06/07 01:41:39 pgoyette Exp $");
+__KERNEL_RCSID(0, "$NetBSD: atapiconf.c,v 1.83.14.1 2012/04/09 17:54:20 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -171,6 +171,9 @@
        struct scsipi_periph *periph;
        int target;
 
+       /* XXXSMP scsipi */
+       KERNEL_LOCK(1, curlwp);
+
        for (target = 0; target < chan->chan_ntargets; target++) {
                periph = scsipi_lookup_periph(chan, target, 0);
                if (periph == NULL || periph->periph_dev != child)
@@ -179,6 +182,9 @@
                free(periph, M_DEVBUF);
                break;
        }
+
+       /* XXXSMP scsipi */
+       KERNEL_UNLOCK_ONE(curlwp);
 }
 
 static int