Date: Tue, 18 Jun 2002 06:45:56 -0700 (PDT) From: Bosko Milekic <bmilekic@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13113 for review Message-ID: <200206181345.g5IDjuK24651@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13113 Change 13113 by bmilekic@bmilekic_angela on 2002/06/18 06:45:41 IFC. Affected files ... ... //depot/projects/interrupt/sys/alpha/conf/GENERIC#4 integrate ... //depot/projects/interrupt/sys/compat/linux/linux_misc.c#5 integrate ... //depot/projects/interrupt/sys/conf/files#7 integrate ... //depot/projects/interrupt/sys/conf/files.i386#6 integrate ... //depot/projects/interrupt/sys/conf/files.pc98#7 integrate ... //depot/projects/interrupt/sys/conf/files.sparc64#6 integrate ... //depot/projects/interrupt/sys/conf/kern.pre.mk#5 integrate ... //depot/projects/interrupt/sys/conf/kmod.mk#5 integrate ... //depot/projects/interrupt/sys/conf/options#5 integrate ... //depot/projects/interrupt/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate ... //depot/projects/interrupt/sys/dev/drm/drm_os_freebsd.h#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni.c#3 integrate ... //depot/projects/interrupt/sys/dev/hea/eni.h#3 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_globals.c#2 integrate ... //depot/projects/interrupt/sys/dev/hea/eni_var.h#3 integrate ... //depot/projects/interrupt/sys/dev/hea/hea_freebsd.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_globals.c#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_include.h#3 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_load.c#3 integrate ... //depot/projects/interrupt/sys/dev/hfa/fore_var.h#2 integrate ... //depot/projects/interrupt/sys/dev/hfa/hfa_freebsd.c#2 integrate ... //depot/projects/interrupt/sys/dev/isp/isp.c#5 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_freebsd.c#4 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_freebsd.h#4 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_inline.h#4 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_ioctl.h#3 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_pci.c#4 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_target.c#3 integrate ... //depot/projects/interrupt/sys/dev/isp/isp_target.h#4 integrate ... //depot/projects/interrupt/sys/dev/isp/ispmbox.h#4 integrate ... //depot/projects/interrupt/sys/dev/isp/ispvar.h#4 integrate ... //depot/projects/interrupt/sys/dev/md/md.c#6 integrate ... //depot/projects/interrupt/sys/dev/pccbb/pccbb.c#4 integrate ... //depot/projects/interrupt/sys/dev/pccbb/pccbbvar.h#3 integrate ... //depot/projects/interrupt/sys/dev/puc/pucdata.c#4 integrate ... //depot/projects/interrupt/sys/dev/puc/pucvar.h#2 integrate ... //depot/projects/interrupt/sys/dev/sio/sio_ebus.c#1 branch ... //depot/projects/interrupt/sys/dev/usb/uhub.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/umass.c#4 integrate ... //depot/projects/interrupt/sys/dev/usb/usb_subr.c#4 integrate ... //depot/projects/interrupt/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null.h#3 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null_subr.c#2 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null_vfsops.c#3 integrate ... //depot/projects/interrupt/sys/fs/nullfs/null_vnops.c#3 integrate ... //depot/projects/interrupt/sys/fs/udf/udf_mount.h#2 delete ... //depot/projects/interrupt/sys/fs/udf/udf_vfsops.c#2 integrate ... //depot/projects/interrupt/sys/fs/unionfs/union.h#3 integrate ... //depot/projects/interrupt/sys/fs/unionfs/union_vfsops.c#5 integrate ... //depot/projects/interrupt/sys/i386/i386/pmap.c#5 integrate ... //depot/projects/interrupt/sys/i386/i386/trap.c#7 integrate ... //depot/projects/interrupt/sys/i4b/capi/iavc/iavc_card.c#2 integrate ... //depot/projects/interrupt/sys/i4b/capi/iavc/iavc_lli.c#3 integrate ... //depot/projects/interrupt/sys/i4b/capi/iavc/iavc_pci.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#3 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate ... //depot/projects/interrupt/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate ... //depot/projects/interrupt/sys/kern/init_sysent.c#5 integrate ... //depot/projects/interrupt/sys/kern/kern_acl.c#5 integrate ... //depot/projects/interrupt/sys/kern/subr_mbuf.c#4 integrate ... //depot/projects/interrupt/sys/kern/syscalls.c#5 integrate ... //depot/projects/interrupt/sys/kern/syscalls.master#5 integrate ... //depot/projects/interrupt/sys/kern/uipc_socket2.c#4 integrate ... //depot/projects/interrupt/sys/kern/vfs_subr.c#6 integrate ... //depot/projects/interrupt/sys/modules/sppp/Makefile#3 integrate ... //depot/projects/interrupt/sys/net/rtsock.c#5 integrate ... //depot/projects/interrupt/sys/netatm/atm_cm.c#3 integrate ... //depot/projects/interrupt/sys/netatm/atm_device.c#4 integrate ... //depot/projects/interrupt/sys/netatm/atm_if.c#3 integrate ... //depot/projects/interrupt/sys/netatm/atm_if.h#3 integrate ... //depot/projects/interrupt/sys/netatm/atm_subr.c#4 integrate ... //depot/projects/interrupt/sys/netatm/atm_sys.h#3 integrate ... //depot/projects/interrupt/sys/netatm/atm_var.h#4 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscf_uni.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscf_uni_lower.c#2 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscop.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscop_lower.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/sscop_var.h#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniarp.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniarp_cache.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniarp_timer.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniarp_vcm.c#2 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniip.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/uniip_var.h#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_decode.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_if.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_msg.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_subr.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_util.c#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_var.h#3 integrate ... //depot/projects/interrupt/sys/netatm/uni/unisig_vc_state.c#3 integrate ... //depot/projects/interrupt/sys/netinet/accf_data.c#3 integrate ... //depot/projects/interrupt/sys/netinet/accf_http.c#3 integrate ... //depot/projects/interrupt/sys/netinet/in_pcb.c#5 integrate ... //depot/projects/interrupt/sys/netinet/in_pcb.h#4 integrate ... //depot/projects/interrupt/sys/netinet/tcp_input.c#5 integrate ... //depot/projects/interrupt/sys/netinet/tcp_output.c#3 integrate ... //depot/projects/interrupt/sys/netinet/tcp_subr.c#5 integrate ... //depot/projects/interrupt/sys/netinet/tcp_syncache.c#6 integrate ... //depot/projects/interrupt/sys/netinet/tcp_usrreq.c#4 integrate ... //depot/projects/interrupt/sys/netinet/tcp_var.h#3 integrate ... //depot/projects/interrupt/sys/netinet/udp_usrreq.c#4 integrate ... //depot/projects/interrupt/sys/netinet/udp_var.h#3 integrate ... //depot/projects/interrupt/sys/netinet6/in6_pcb.c#4 integrate ... //depot/projects/interrupt/sys/netinet6/in6_pcb.h#3 integrate ... //depot/projects/interrupt/sys/netinet6/raw_ip6.c#4 integrate ... //depot/projects/interrupt/sys/netinet6/udp6_usrreq.c#5 integrate ... //depot/projects/interrupt/sys/netkey/keysock.c#4 integrate ... //depot/projects/interrupt/sys/pccard/pcic_pci.c#4 integrate ... //depot/projects/interrupt/sys/sparc64/conf/GENERIC#4 integrate ... //depot/projects/interrupt/sys/sparc64/include/vmparam.h#3 integrate ... //depot/projects/interrupt/sys/sparc64/pci/ofw_pci.c#4 integrate ... //depot/projects/interrupt/sys/sparc64/pci/ofw_pci.h#3 integrate ... //depot/projects/interrupt/sys/sparc64/pci/psycho.c#5 integrate ... //depot/projects/interrupt/sys/sparc64/pci/psychoreg.h#4 integrate ... //depot/projects/interrupt/sys/sparc64/sparc64/pmap.c#6 integrate ... //depot/projects/interrupt/sys/sys/_sigset.h#1 branch ... //depot/projects/interrupt/sys/sys/_types.h#2 integrate ... //depot/projects/interrupt/sys/sys/file.h#4 integrate ... //depot/projects/interrupt/sys/sys/malloc.h#4 integrate ... //depot/projects/interrupt/sys/sys/mount.h#4 integrate ... //depot/projects/interrupt/sys/sys/select.h#3 integrate ... //depot/projects/interrupt/sys/sys/signal.h#4 integrate ... //depot/projects/interrupt/sys/sys/socket.h#4 integrate ... //depot/projects/interrupt/sys/sys/socketvar.h#4 integrate ... //depot/projects/interrupt/sys/sys/statvfs.h#1 branch ... //depot/projects/interrupt/sys/sys/syscall.h#5 integrate ... //depot/projects/interrupt/sys/sys/syscall.mk#5 integrate ... //depot/projects/interrupt/sys/sys/sysproto.h#5 integrate ... //depot/projects/interrupt/sys/sys/time.h#4 integrate ... //depot/projects/interrupt/sys/sys/types.h#5 integrate ... //depot/projects/interrupt/sys/vm/uma.h#2 integrate ... //depot/projects/interrupt/sys/vm/uma_core.c#2 integrate ... //depot/projects/interrupt/sys/vm/uma_int.h#2 integrate ... //depot/projects/interrupt/sys/vm/vm_contig.c#4 integrate ... //depot/projects/interrupt/sys/vm/vm_fault.c#5 integrate ... //depot/projects/interrupt/sys/vm/vm_glue.c#5 integrate ... //depot/projects/interrupt/sys/vm/vm_kern.c#4 integrate ... //depot/projects/interrupt/sys/vm/vm_map.c#6 integrate ... //depot/projects/interrupt/sys/vm/vm_map.h#5 integrate ... //depot/projects/interrupt/sys/vm/vm_mmap.c#6 integrate Differences ... ==== //depot/projects/interrupt/sys/alpha/conf/GENERIC#4 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.139 2002/06/14 20:20:13 mjacob Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.140 2002/06/16 06:48:42 mjacob Exp $ machine alpha cpu EV4 @@ -97,7 +97,6 @@ device ahc # AHA2940 and onboard AIC7xxx devices #device esp # 53C94 & friends, not CAM-ified device isp # Qlogic family -device mpt # LSI-Logic MPT-Fusion #device ncr # NCR/Symbios Logic device sym # NCR/Symbios Logic (newer chipsets + those of `ncr') ==== //depot/projects/interrupt/sys/compat/linux/linux_misc.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.122 2002/06/02 20:05:42 schweikh Exp $ + * $FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.123 2002/06/14 07:24:01 rwatson Exp $ */ #include "opt_compat.h" @@ -302,6 +302,10 @@ if (error) goto cleanup; + /* + * XXX: This should use vn_open() so that it is properly authorized, + * and to reduce code redundancy all over the place here. + */ error = VOP_OPEN(vp, FREAD, td->td_ucred, td); if (error) goto cleanup; ==== //depot/projects/interrupt/sys/conf/files#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/files,v 1.646 2002/06/10 18:49:37 phk Exp $ +# $FreeBSD: src/sys/conf/files,v 1.649 2002/06/17 05:40:40 jhay Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -774,7 +774,7 @@ # # isdn4bsd AVM B1/T1 CAPI driver # -i4b/capi/iavc/iavc_pci.c count iavc +i4b/capi/iavc/iavc_pci.c count iavc pci i4b/capi/iavc/iavc_isa.c optional iavc i4b/capi/iavc/iavc_lli.c optional iavc i4b/capi/iavc/iavc_card.c optional iavc @@ -831,7 +831,6 @@ kern/init_sysent.c standard kern/kern_acct.c standard kern/kern_acl.c standard -kern/kern_cap.c standard kern/kern_clock.c standard kern/kern_condvar.c standard kern/kern_conf.c standard @@ -1016,6 +1015,7 @@ net/rtsock.c standard net/slcompress.c optional ppp net/slcompress.c optional sl +net/slcompress.c optional sppp net/zlib.c optional ppp_deflate net/zlib.c optional ipsec netatalk/aarp.c optional netatalk ==== //depot/projects/interrupt/sys/conf/files.i386#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.i386,v 1.401 2002/06/03 22:30:35 pdeuskar Exp $ +# $FreeBSD: src/sys/conf/files.i386,v 1.402 2002/06/13 06:04:25 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -338,7 +338,7 @@ i4b/layer1/isic/i4b_drn_ngo.c optional isic i4b/layer1/isic/i4b_dynalink.c optional isic i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic +i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci i4b/layer1/isic/i4b_elsa_pcc16.c optional isic i4b/layer1/isic/i4b_hscx.c optional isic i4b/layer1/isic/i4b_isac.c optional isic @@ -358,25 +358,25 @@ # # isdn4bsd, iwic # -i4b/layer1/iwic/i4b_iwic_pci.c count iwic -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic +i4b/layer1/iwic/i4b_iwic_pci.c count iwic pci +i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci # # isdn4bsd, ifpi # -i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi +i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi pci +i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 +i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci # # isdn4bsd, ifpnp # ==== //depot/projects/interrupt/sys/conf/files.pc98#7 (text+ko) ==== @@ -3,7 +3,7 @@ # # modified for PC-9801 # -# $FreeBSD: src/sys/conf/files.pc98,v 1.233 2002/06/03 22:30:35 pdeuskar Exp $ +# $FreeBSD: src/sys/conf/files.pc98,v 1.234 2002/06/13 06:04:25 brooks Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -308,7 +308,7 @@ i4b/layer1/isic/i4b_drn_ngo.c optional isic i4b/layer1/isic/i4b_dynalink.c optional isic i4b/layer1/isic/i4b_elsa_qs1i.c optional isic -i4b/layer1/isic/i4b_elsa_qs1p.c optional isic +i4b/layer1/isic/i4b_elsa_qs1p.c optional isic pci i4b/layer1/isic/i4b_elsa_pcc16.c optional isic i4b/layer1/isic/i4b_hscx.c optional isic i4b/layer1/isic/i4b_isac.c optional isic @@ -328,25 +328,25 @@ # # isdn4bsd, iwic # -i4b/layer1/iwic/i4b_iwic_pci.c count iwic -i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic -i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic -i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic +i4b/layer1/iwic/i4b_iwic_pci.c count iwic pci +i4b/layer1/iwic/i4b_iwic_dchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_bchan.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_fsm.c optional iwic pci +i4b/layer1/iwic/i4b_iwic_l1if.c optional iwic pci # # isdn4bsd, ifpi # -i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi -i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi -i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi +i4b/layer1/ifpi/i4b_ifpi_pci.c count ifpi pci +i4b/layer1/ifpi/i4b_ifpi_isac.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1.c optional ifpi pci +i4b/layer1/ifpi/i4b_ifpi_l1fsm.c optional ifpi pci # # isdn4bsd, ifpi2 # -i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 -i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 +i4b/layer1/ifpi2/i4b_ifpi2_pci.c count ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1.c optional ifpi2 pci +i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c optional ifpi2 pci # # isdn4bsd, ifpnp # ==== //depot/projects/interrupt/sys/conf/files.sparc64#6 (text+ko) ==== @@ -1,7 +1,7 @@ # This file tells config what files go into building a kernel, # files marked standard are always included. # -# $FreeBSD: src/sys/conf/files.sparc64,v 1.21 2002/06/08 07:17:18 jake Exp $ +# $FreeBSD: src/sys/conf/files.sparc64,v 1.22 2002/06/18 01:14:54 obrien Exp $ # # The long compile-with and dependency lines are required because of # limitations in config: backslash-newline doesn't work in strings, and @@ -12,6 +12,12 @@ crypto/des/des_enc.c optional ipsec ipsec_esp dev/ofw/ofw_console.c optional ofw_console dev/ofw/openfirm.c standard +dev/sio/sio.c optional sio +dev/sio/sio_ebus.c optional sio ebus +dev/sio/sio_isa.c optional sio isa +dev/sio/sio_pccard.c optional sio card +dev/sio/sio_pccard.c optional sio pccard +dev/sio/sio_pci.c optional sio pci libkern/ffs.c standard kern/subr_diskmbr.c standard kern/syscalls.c optional ktr ==== //depot/projects/interrupt/sys/conf/kern.pre.mk#5 (text+ko) ==== @@ -3,7 +3,7 @@ # Unified Makefile for building kenrels. This includes all the definitions # that need to be included before %BEFORE_DEPEND # -# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.12 2002/05/12 15:51:38 bde Exp $ +# $FreeBSD: src/sys/conf/kern.pre.mk,v 1.13 2002/06/16 10:42:05 mux Exp $ # # Can be overridden by makeoptions or /etc/make.conf @@ -38,7 +38,7 @@ INCLUDES+= -I/usr/include .endif -COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -ffreestanding -include opt_global.h +COPTS= ${INCLUDES} ${IDENT} -D_KERNEL -include opt_global.h CFLAGS= ${COPTFLAGS} ${CWARNFLAGS} ${DEBUG} ${COPTS} -fno-common # XXX LOCORE means "don't declare C stuff" not "for locore.s". ==== //depot/projects/interrupt/sys/conf/kmod.mk#5 (text+ko) ==== @@ -1,5 +1,5 @@ # From: @(#)bsd.prog.mk 5.26 (Berkeley) 6/25/91 -# $FreeBSD: src/sys/conf/kmod.mk,v 1.124 2002/05/14 07:49:12 ru Exp $ +# $FreeBSD: src/sys/conf/kmod.mk,v 1.125 2002/06/17 20:01:06 n_hibma Exp $ # # The include file <bsd.kmod.mk> handles installing Kernel Loadable Device # drivers (KLD's). @@ -278,7 +278,7 @@ .if !target(load) load: ${PROG} - ${KMODLOAD} -v ${.CURDIR}/${KMOD}.ko + ${KMODLOAD} -v ${.OBJDIR}/${KMOD}.ko .endif .if !target(unload) ==== //depot/projects/interrupt/sys/conf/options#5 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/conf/options,v 1.324 2002/06/10 18:49:38 phk Exp $ +# $FreeBSD: src/sys/conf/options,v 1.325 2002/06/13 22:41:23 rwatson Exp $ # # On the handling of kernel options # @@ -115,7 +115,6 @@ _KPOSIX_VERSION opt_posix.h # TrustedBSD and POSIX.1e Kernel Options -CAPABILITIES opt_cap.h # Do we want the config file compiled into the kernel? INCLUDE_CONFIG_FILE opt_config.h ==== //depot/projects/interrupt/sys/contrib/dev/acpica/acpica_prep.sh#2 (text+ko) ==== @@ -1,15 +1,20 @@ #!/bin/sh -# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.1 2002/02/08 02:16:45 msmith Exp $ +# $FreeBSD: src/sys/contrib/dev/acpica/acpica_prep.sh,v 1.2 2002/06/12 14:55:19 iwasaki Exp $ # # Unpack an ACPI CA drop and restructure it to fit the FreeBSD layout # +if [ ! $# -eq 1 ]; then + echo "usage: $0 acpica_archive" + exit +fi + src=$1 wrk=./_acpi_ca_unpack dst=./acpi_ca_destination # files to remove -stripdirs="compiler" +stripdirs="compiler generate" stripfiles="osunixxf.c 16bit.h Makefile a16find.c a16utils.asm a16utils.obj\ acintel.h aclinux.h acmsvc.h acwin.h acwin64.h getopt.c" @@ -39,4 +44,4 @@ # post-clean echo post-clean -rm -rf ${wrk}+rm -rf ${wrk} ==== //depot/projects/interrupt/sys/dev/drm/drm_os_freebsd.h#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.5 2002/05/31 23:19:50 anholt Exp $ + * $FreeBSD: src/sys/dev/drm/drm_os_freebsd.h,v 1.6 2002/06/16 21:50:42 des Exp $ */ #include <sys/param.h> @@ -17,7 +17,6 @@ #include <sys/uio.h> #include <sys/filio.h> #include <sys/sysctl.h> -#include <sys/select.h> #include <vm/vm.h> #include <vm/pmap.h> #include <machine/pmap.h> ==== //depot/projects/interrupt/sys/dev/hea/eni.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.21 2002/06/11 21:22:32 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.22 2002/06/14 16:59:37 arr Exp $ * */ @@ -66,7 +66,7 @@ #include <dev/hea/eni_var.h> #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.21 2002/06/11 21:22:32 alfred Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni.c,v 1.22 2002/06/14 16:59:37 arr Exp $"); #endif /* @@ -415,8 +415,8 @@ eup->eu_openvcc = eni_openvcc; eup->eu_closevcc = eni_closevcc; eup->eu_output = eni_output; - eup->eu_vcc_pool = &eni_vcc_pool; - eup->eu_nif_pool = &eni_nif_pool; + eup->eu_vcc_zone = eni_vcc_zone; + eup->eu_nif_zone = eni_nif_zone; /* * Enable Memory Mapping / Bus Mastering ==== //depot/projects/interrupt/sys/dev/hea/eni.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.5 2002/06/07 05:23:01 mdodd Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni.h,v 1.6 2002/06/14 16:59:37 arr Exp $ * */ @@ -491,8 +491,8 @@ #define eu_mtu eu_cmn.cu_mtu #define eu_open_vcc eu_cmn.cu_open_vcc #define eu_vcc eu_cmn.cu_vcc -#define eu_vcc_pool eu_cmn.cu_vcc_pool -#define eu_nif_pool eu_cmn.cu_nif_pool +#define eu_vcc_zone eu_cmn.cu_vcc_zone +#define eu_nif_zone eu_cmn.cu_nif_zone #define eu_ioctl eu_cmn.cu_ioctl #define eu_instvcc eu_cmn.cu_instvcc #define eu_openvcc eu_cmn.cu_openvcc ==== //depot/projects/interrupt/sys/dev/hea/eni_globals.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.8 2000/10/27 21:32:06 phk Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.9 2002/06/14 16:59:37 arr Exp $ * */ @@ -53,8 +53,10 @@ #include <dev/hea/eni_stats.h> #include <dev/hea/eni.h> +#include <vm/uma.h> + #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.8 2000/10/27 21:32:06 phk Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hea/eni_globals.c,v 1.9 2002/06/14 16:59:37 arr Exp $"); #endif /* @@ -98,17 +100,5 @@ /* * Storage pools */ -struct sp_info eni_nif_pool = { - "eni nif pool", /* si_name */ - sizeof(struct atm_nif), /* si_blksiz */ - 5, /* si_blkcnt */ - 52 /* si_maxallow */ -}; - -struct sp_info eni_vcc_pool = { - "eni vcc pool", /* si_name */ - sizeof(Eni_vcc), /* si_blksiz */ - 10, /* si_blkcnt */ - 100 /* si_maxallow */ -}; - +uma_zone_t eni_nif_zone; +uma_zone_t eni_vcc_zone; ==== //depot/projects/interrupt/sys/dev/hea/eni_var.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hea/eni_var.h,v 1.3 2002/03/20 02:07:22 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hea/eni_var.h,v 1.4 2002/06/14 16:59:37 arr Exp $ * */ @@ -79,7 +79,7 @@ */ extern Eni_unit *eni_units[]; extern struct stack_defn *eni_services; -extern struct sp_info eni_nif_pool; -extern struct sp_info eni_vcc_pool; +extern uma_zone_t eni_nif_zone; +extern uma_zone_t eni_vcc_zone; #endif /* _ENI_ENI_VAR_H */ ==== //depot/projects/interrupt/sys/dev/hea/hea_freebsd.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hea/hea_freebsd.c,v 1.3 2002/06/07 05:23:01 mdodd Exp $ + * $FreeBSD: src/sys/dev/hea/hea_freebsd.c,v 1.4 2002/06/14 16:59:37 arr Exp $ */ /* @@ -158,13 +158,25 @@ eup = &sc->eup; error = 0; + eni_vcc_zone = uma_zcreate("eni vcc", sizeof(Eni_vcc), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (eni_vcc_zone == NULL) + panic("hea_attach: uma_zcreate vcc"); + uma_zone_set_max(eni_vcc_zone, 100); + + eni_nif_zone = uma_zcreate("eni nif", sizeof(struct atm_nif), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (eni_nif_zone == NULL) + panic("hea_attach: uma_zcreate nif"); + uma_zone_set_max(eni_nif_zone, 52); + /* * Start initializing it */ eup->eu_unit = device_get_unit(dev); eup->eu_mtu = ENI_IFF_MTU; - eup->eu_vcc_pool = &eni_vcc_pool; - eup->eu_nif_pool = &eni_nif_pool; + eup->eu_vcc_zone = eni_vcc_zone; + eup->eu_nif_zone = eni_nif_zone; eup->eu_ioctl = eni_atm_ioctl; eup->eu_instvcc = eni_instvcc; eup->eu_openvcc = eni_openvcc; @@ -329,6 +341,9 @@ hea_free(dev); + uma_zdestroy(eni_vcc_zone); + uma_zdestroy(eni_nif_zone); + return (error); } ==== //depot/projects/interrupt/sys/dev/hfa/fore_globals.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.9 2000/10/30 20:37:00 phk Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.10 2002/06/14 16:59:37 arr Exp $ * */ @@ -57,8 +57,10 @@ #include <dev/hfa/fore_stats.h> #include <dev/hfa/fore_var.h> +#include <vm/uma.h> + #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.9 2000/10/30 20:37:00 phk Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_globals.c,v 1.10 2002/06/14 16:59:37 arr Exp $"); #endif /* @@ -104,20 +106,8 @@ /* * Storage pools */ -struct sp_info fore_nif_pool = { - "fore nif pool", /* si_name */ - sizeof(struct atm_nif), /* si_blksiz */ - 5, /* si_blkcnt */ - 52 /* si_maxallow */ -}; - -struct sp_info fore_vcc_pool = { - "fore vcc pool", /* si_name */ - sizeof(Fore_vcc), /* si_blksiz */ - 10, /* si_blkcnt */ - 100 /* si_maxallow */ -}; - +uma_zone_t fore_nif_zone; +uma_zone_t fore_vcc_zone; /* * Watchdog timer ==== //depot/projects/interrupt/sys/dev/hfa/fore_include.h#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.5 2002/03/20 02:07:23 alfred Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_include.h,v 1.6 2002/06/14 16:59:37 arr Exp $ * */ @@ -101,8 +101,8 @@ extern Fore_unit *fore_units[]; extern int fore_nunits; extern struct stack_defn *fore_services; -extern struct sp_info fore_nif_pool; -extern struct sp_info fore_vcc_pool; +extern uma_zone_t fore_nif_zone; +extern uma_zone_t fore_vcc_zone; extern struct atm_time fore_timer; #endif /* _FORE_INCLUDE_H */ ==== //depot/projects/interrupt/sys/dev/hfa/fore_load.c#3 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.25 2002/04/16 01:38:31 arr Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.26 2002/06/14 16:59:37 arr Exp $ * */ @@ -67,7 +67,7 @@ #include <dev/hfa/fore_include.h> #ifndef lint -__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.25 2002/04/16 01:38:31 arr Exp $"); +__RCSID("@(#) $FreeBSD: src/sys/dev/hfa/fore_load.c,v 1.26 2002/06/14 16:59:37 arr Exp $"); #endif static int fore_probe(device_t); @@ -225,8 +225,8 @@ fup->fu_unit = unit; fup->fu_mtu = FORE_IFF_MTU; fup->fu_pcitag = config_id; - fup->fu_vcc_pool = &fore_vcc_pool; - fup->fu_nif_pool = &fore_nif_pool; + fup->fu_vcc_zone = fore_vcc_zone; + fup->fu_nif_zone = &fore_nif_zone; fup->fu_ioctl = fore_atm_ioctl; fup->fu_instvcc = fore_instvcc; fup->fu_openvcc = fore_openvcc; ==== //depot/projects/interrupt/sys/dev/hfa/fore_var.h#2 (text+ko) ==== @@ -23,7 +23,7 @@ * Copies of this Software may be made, however, the above copyright * notice must be reproduced on all copies. * - * @(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.5 2001/01/17 01:08:49 peter Exp $ + * @(#) $FreeBSD: src/sys/dev/hfa/fore_var.h,v 1.6 2002/06/14 16:59:37 arr Exp $ * */ @@ -237,8 +237,8 @@ #define fu_vcc fu_cmn.cu_vcc #define fu_intrpri fu_cmn.cu_intrpri #define fu_savepri fu_cmn.cu_savepri -#define fu_vcc_pool fu_cmn.cu_vcc_pool -#define fu_nif_pool fu_cmn.cu_nif_pool +#define fu_vcc_zone fu_cmn.cu_vcc_zone +#define fu_nif_zone fu_cmn.cu_nif_zone #define fu_ioctl fu_cmn.cu_ioctl #define fu_instvcc fu_cmn.cu_instvcc #define fu_openvcc fu_cmn.cu_openvcc ==== //depot/projects/interrupt/sys/dev/hfa/hfa_freebsd.c#2 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.2 2002/06/07 01:55:42 mdodd Exp $ + * $FreeBSD: src/sys/dev/hfa/hfa_freebsd.c,v 1.3 2002/06/14 16:59:37 arr Exp $ */ /* @@ -169,8 +169,8 @@ */ fup->fu_unit = device_get_unit(dev); fup->fu_mtu = FORE_IFF_MTU; - fup->fu_vcc_pool = &fore_vcc_pool; - fup->fu_nif_pool = &fore_nif_pool; + fup->fu_vcc_zone = fore_vcc_zone; + fup->fu_nif_zone = fore_nif_zone; fup->fu_ioctl = fore_atm_ioctl; fup->fu_instvcc = fore_instvcc; fup->fu_openvcc = fore_openvcc; @@ -377,6 +377,19 @@ error = EINVAL; break; } + + fore_nif_zone = uma_zcreate("fore nif", sizeof(struct atm_nif), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (fore_nif_zone == NULL) + panic("hfa_modevent:uma_zcreate nif"); + uma_zone_set_max(fore_nif_zone, 52); + + fore_vcc_zone = uma_zcreate("fore vcc", sizeof(Fore_vcc), NULL, + NULL, NULL, NULL, UMA_ALIGN_PTR, 0); + if (fore_vcc_zone == NULL) + panic("hfa_modevent: uma_zcreate vcc"); + uma_zone_set_max(fore_vcc_zone, 100); + /* * Initialize DMA mapping */ @@ -399,6 +412,9 @@ */ atm_untimeout(&fore_timer); + uma_zdestroy(fore_nif_zone); + uma_zdestroy(fore_vcc_zone); + break; default: break; ==== //depot/projects/interrupt/sys/dev/isp/isp.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.93 2002/05/01 21:58:36 mjacob Exp $ */ +/* $FreeBSD: src/sys/dev/isp/isp.c,v 1.94 2002/06/16 05:18:22 mjacob Exp $ */ /* * Machine and OS Independent (well, as best as possible) * code for the Qlogic ISP SCSI adapters. @@ -161,7 +161,7 @@ { mbreg_t mbs; u_int16_t code_org; - int loops, i, touched, dodnld = 1; + int loops, i, dodnld = 1; char *btype = "????"; isp->isp_state = ISP_NILSTATE; @@ -184,7 +184,7 @@ * case, we don't really use this yet, but we may in * the future. */ - if ((touched = isp->isp_touched) == 0) { + if (isp->isp_touched == 0) { /* * First see whether or not we're sitting in the ISP PROM. * If we've just been reset, we'll have the string "ISP " @@ -676,8 +676,10 @@ mbs.param[0] = MBOX_EXEC_FIRMWARE; mbs.param[1] = code_org; isp_mboxcmd(isp, &mbs, MBLOGNONE); - /* give it a chance to start */ - USEC_SLEEP(isp, 500); + /* + * Give it a chance to start. + */ + USEC_DELAY(500); if (IS_SCSI(isp)) { /* @@ -789,19 +791,21 @@ * because we may be called again after firmware has been loaded once * and released. */ - if (touched == 0) { - if (IS_SCSI(isp)) { - if (dodnld) { + if (IS_SCSI(isp)) { + if (dodnld) { + if (IS_ULTRA2(isp) || IS_ULTRA3(isp)) { isp->isp_maxluns = 32; } else { isp->isp_maxluns = 8; } } else { - if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { - isp->isp_maxluns = 16384; - } else { - isp->isp_maxluns = 16; - } + isp->isp_maxluns = 8; + } + } else { + if (FCPARAM(isp)->isp_fwattr & ISP_FW_ATTR_SCCLUN) { + isp->isp_maxluns = 16384; + } else { + isp->isp_maxluns = 16; } } } @@ -1177,7 +1181,6 @@ */ fcp->isp_fwoptions |= ICBOPT_PDBCHANGE_AE; - /* * Make sure that target role reflects into fwoptions. */ @@ -2411,7 +2414,13 @@ rs0 = (sns_ga_nxt_rsp_t *) ((u_int8_t *)fcp->isp_scratch+0x100); isp_get_ga_nxt_response(isp, rs0, rs1); if (rs1->snscb_cthdr.ct_response != FS_ACC) { - isp_prt(isp, ISP_LOGWARN, swrej, "GA_NXT", + int level; + if (rs1->snscb_cthdr.ct_reason == 9 && + rs1->snscb_cthdr.ct_explanation == 7) + level = ISP_LOGDEBUG0; + else + level = ISP_LOGWARN; + isp_prt(isp, level, swrej, "GA_NXT", rs1->snscb_cthdr.ct_reason, rs1->snscb_cthdr.ct_explanation, portid); FC_SCRATCH_RELEASE(isp); @@ -2424,6 +2433,10 @@ (((u_int32_t) rs1->snscb_port_id[2])); /* + * XXX: We should check to make sure that this entry + * XXX: supports the type(s) we are interested in. + */ + /* * Okay, we now have information about a fabric object. * If it is the type we're interested in, tell the outer layers * about it. The outer layer needs to know: Port ID, WWNN, @@ -2556,7 +2569,13 @@ rs0 = (sns_gid_ft_rsp_t *) ((u_int8_t *)fcp->isp_scratch+IGPOFF); isp_get_gid_ft_response(isp, rs0, rs1, NGENT); if (rs1->snscb_cthdr.ct_response != FS_ACC) { - isp_prt(isp, ISP_LOGWARN, swrej, "GID_FT", + int level; + if (rs1->snscb_cthdr.ct_reason == 9 && + rs1->snscb_cthdr.ct_explanation == 7) + level = ISP_LOGDEBUG0; + else + level = ISP_LOGWARN; + isp_prt(isp, level, swrej, "GID_FT", rs1->snscb_cthdr.ct_reason, rs1->snscb_cthdr.ct_explanation, 0); FC_SCRATCH_RELEASE(isp); @@ -2791,6 +2810,12 @@ } FC_SCRATCH_RELEASE(isp); + /* + * XXX: Workaround for some bogus fabric registrants + */ + if (ftype) { + (void) isp_scan_fabric(isp, 0); + } fcp->isp_loopstate = LOOP_FSCAN_DONE; return (0); } @@ -3023,7 +3048,7 @@ return (CMD_RQLATER); } if (fcp->isp_fwstate != FW_READY || - fcp->isp_loopstate < LOOP_PDB_RCVD) { + fcp->isp_loopstate < LOOP_FSCAN_DONE) { return (CMD_RQLATER); } } @@ -3199,7 +3224,7 @@ XS_SETERR(xs, HBA_NOERROR); isp_prt(isp, ISP_LOGDEBUG2, "START cmd for %d.%d.%d cmd 0x%x datalen %ld", - XS_CHANNEL(xs), target, XS_LUN(xs), XS_CDBP(xs)[0], + XS_CHANNEL(xs), XS_TGT(xs), XS_LUN(xs), XS_CDBP(xs)[0], (long) XS_XFRLEN(xs)); ISP_ADD_REQUEST(isp, nxti); isp->isp_nactive++; @@ -3665,11 +3690,15 @@ * Only whine if this isn't the expected fallout of * aborting the command. */ - if (sp->req_header.rqs_entry_type != RQSTYPE_RESPONSE || - ts != RQCS_ABORTED) { + if (sp->req_header.rqs_entry_type != RQSTYPE_RESPONSE) { + isp_prt(isp, ISP_LOGERR, + "cannot find handle 0x%x (type 0x%x)", >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200206181345.g5IDjuK24651>