Module Name: src Committed By: riz Date: Mon Mar 19 23:14:00 UTC 2012
Modified Files: src/sys/dev/ic [netbsd-6]: ncr53c9x.c ninjascsi32.c src/sys/dev/scsipi [netbsd-6]: scsiconf.c src/sys/dev/usb [netbsd-6]: uhub.c Log Message: Pull up following revision(s) (requested by mrg in ticket #125): sys/dev/scsipi/scsiconf.c: revision 1.263 sys/dev/scsipi/scsiconf.c: revision 1.264 sys/dev/ic/ncr53c9x.c: revision 1.144 sys/dev/ic/ninjascsi32.c: revision 1.22 sys/dev/usb/uhub.c: revision 1.117 take the kernel lock in functions called from attach*(). scsidevdetached ioctl path enters scsipi code without kernel lock and this upsets the newer kasserts. take kernel lock here. take the kernel lock a few more places when doing detach, to avoid triggering KERNEL_LOCK_P() asserts in both scsi and usb code. with this and other recent fixes i can now "drvctl -d ehci0". To generate a diff of this commit: cvs rdiff -u -r1.143 -r1.143.8.1 src/sys/dev/ic/ncr53c9x.c cvs rdiff -u -r1.21 -r1.21.14.1 src/sys/dev/ic/ninjascsi32.c cvs rdiff -u -r1.262 -r1.262.10.1 src/sys/dev/scsipi/scsiconf.c cvs rdiff -u -r1.114 -r1.114.10.1 src/sys/dev/usb/uhub.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.