Date: Wed, 2 Apr 2003 08:04:00 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 27909 for review Message-ID: <200304021604.h32G40XC094213@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=27909 Change 27909 by jhb@jhb_laptop on 2003/04/02 08:03:01 IFC @27908. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#53 integrate .. //depot/projects/smpng/sys/alpha/alpha/mem.c#10 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#44 integrate .. //depot/projects/smpng/sys/alpha/include/_types.h#3 integrate .. //depot/projects/smpng/sys/alpha/include/param.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/pmap.h#14 integrate .. //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#12 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#16 integrate .. //depot/projects/smpng/sys/arm/include/_types.h#2 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#16 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#35 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#7 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#13 integrate .. //depot/projects/smpng/sys/coda/coda_fbsd.c#4 integrate .. //depot/projects/smpng/sys/coda/coda_psdev.c#9 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#24 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.c#8 integrate .. //depot/projects/smpng/sys/compat/linux/linux_mib.h#6 integrate .. //depot/projects/smpng/sys/compat/linux/linux_signal.c#9 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_filio.c#10 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_signal.c#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#40 integrate .. //depot/projects/smpng/sys/conf/files#68 integrate .. //depot/projects/smpng/sys/conf/files.pc98#38 integrate .. //depot/projects/smpng/sys/conf/options#49 integrate .. //depot/projects/smpng/sys/conf/options.i386#23 integrate .. //depot/projects/smpng/sys/conf/options.pc98#25 integrate .. //depot/projects/smpng/sys/contrib/dev/fla/fla.c#8 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#24 integrate .. //depot/projects/smpng/sys/dev/aac/aac_cam.c#8 integrate .. //depot/projects/smpng/sys/dev/aac/aac_debug.c#10 integrate .. //depot/projects/smpng/sys/dev/aac/aac_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/aac/aacreg.h#11 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#17 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#23 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/advansys.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adw_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#3 integrate .. //depot/projects/smpng/sys/dev/aha/aha.c#6 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/aha/aha_mca.c#3 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#4 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#8 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#6 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#15 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#6 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#9 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#10 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#34 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#8 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#27 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#11 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#28 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-all.c#19 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#34 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#18 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#12 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#6 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_mca.c#3 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ccd/ccd.c#23 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt.h#3 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#4 integrate .. //depot/projects/smpng/sys/dev/drm/drm_vm.h#4 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#11 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#5 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#6 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#3 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_mca.c#2 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#6 integrate .. //depot/projects/smpng/sys/dev/ep/if_epvar.h#2 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#5 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#3 integrate .. //depot/projects/smpng/sys/dev/ex/if_exreg.h#2 integrate .. //depot/projects/smpng/sys/dev/ex/if_exvar.h#2 integrate .. //depot/projects/smpng/sys/dev/fb/fb.c#7 integrate .. //depot/projects/smpng/sys/dev/fb/fbreg.h#7 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#12 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/ic/i82586.h#2 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#8 integrate .. //depot/projects/smpng/sys/dev/ida/ida_disk.c#9 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#4 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/idt/idt_harp.c#2 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#5 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie507.h#2 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie_isa.c#1 branch .. //depot/projects/smpng/sys/dev/ie/if_iee16.h#2 integrate .. //depot/projects/smpng/sys/dev/ie/if_iereg.h#2 integrate .. //depot/projects/smpng/sys/dev/ie/if_ievar.h#1 branch .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#14 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#4 integrate .. //depot/projects/smpng/sys/dev/md/md.c#32 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#9 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_disk.c#7 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/pccard/Makefile.pccarddevs#2 integrate .. //depot/projects/smpng/sys/dev/pccard/devlist2h.awk#3 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_freebsd.h#5 integrate .. //depot/projects/smpng/sys/dev/pst/pst-raid.c#5 integrate .. //depot/projects/smpng/sys/dev/raidframe/rf_freebsdkintf.c#8 integrate .. //depot/projects/smpng/sys/dev/sab/sab.c#10 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.h#5 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/dsp.c#12 integrate .. //depot/projects/smpng/sys/dev/syscons/apm/apm_saver.c#5 integrate .. //depot/projects/smpng/sys/dev/syscons/syscons.c#28 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#11 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#14 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#21 integrate .. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#11 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_io.c#11 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#17 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#7 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#7 integrate .. //depot/projects/smpng/sys/geom/geom.h#22 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.h#2 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#21 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#21 integrate .. //depot/projects/smpng/sys/geom/geom_disk.h#1 branch .. //depot/projects/smpng/sys/geom/geom_ext.h#2 integrate .. //depot/projects/smpng/sys/geom/geom_int.h#9 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#21 integrate .. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#14 integrate .. //depot/projects/smpng/sys/i386/bios/apm.c#2 integrate .. //depot/projects/smpng/sys/i386/bios/apm.h#2 integrate .. //depot/projects/smpng/sys/i386/conf/GENERIC#34 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#53 integrate .. //depot/projects/smpng/sys/i386/conf/SMP#2 integrate .. //depot/projects/smpng/sys/i386/i386/bios.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/busdma_machdep.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/db_interface.c#16 integrate .. //depot/projects/smpng/sys/i386/i386/elan-mmcr.c#6 integrate .. //depot/projects/smpng/sys/i386/i386/locore.s#15 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#55 integrate .. //depot/projects/smpng/sys/i386/i386/mem.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#43 integrate .. //depot/projects/smpng/sys/i386/i386/mpboot.s#2 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#34 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#9 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#51 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#15 integrate .. //depot/projects/smpng/sys/i386/i386/vm86bios.s#5 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#32 integrate .. //depot/projects/smpng/sys/i386/ibcs2/ibcs2_signal.c#8 integrate .. //depot/projects/smpng/sys/i386/include/_types.h#4 integrate .. //depot/projects/smpng/sys/i386/include/bus_at386.h#8 integrate .. //depot/projects/smpng/sys/i386/include/md_var.h#18 integrate .. //depot/projects/smpng/sys/i386/include/param.h#9 integrate .. //depot/projects/smpng/sys/i386/include/physio_proc.h#4 integrate .. //depot/projects/smpng/sys/i386/include/pmap.h#13 integrate .. //depot/projects/smpng/sys/i386/include/smp.h#9 integrate .. //depot/projects/smpng/sys/i386/isa/elink.c#2 integrate .. //depot/projects/smpng/sys/i386/isa/elink.h#3 integrate .. //depot/projects/smpng/sys/i386/isa/isa_dma.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#32 integrate .. //depot/projects/smpng/sys/i386/isa/pcvt/pcvt_drv.c#9 integrate .. //depot/projects/smpng/sys/i386/isa/spigot.c#12 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#21 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#29 integrate .. //depot/projects/smpng/sys/i386/svr4/svr4_machdep.c#10 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s016.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_tel_s08.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#8 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#51 integrate .. //depot/projects/smpng/sys/ia64/ia64/mem.c#11 integrate .. //depot/projects/smpng/sys/ia64/ia64/sscdisk.c#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#43 integrate .. //depot/projects/smpng/sys/ia64/include/_types.h#4 integrate .. //depot/projects/smpng/sys/ia64/include/float.h#4 integrate .. //depot/projects/smpng/sys/isa/fd.c#20 integrate .. //depot/projects/smpng/sys/isa/orm.c#2 integrate .. //depot/projects/smpng/sys/isa/vga_isa.c#5 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#7 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#27 integrate .. //depot/projects/smpng/sys/kern/kern_condvar.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_context.c#2 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#59 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#54 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#19 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#47 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#56 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#44 integrate .. //depot/projects/smpng/sys/kern/kern_thr.c#1 branch .. //depot/projects/smpng/sys/kern/kern_thread.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_umtx.c#1 branch .. //depot/projects/smpng/sys/kern/makesyscalls.sh#14 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#3 integrate .. //depot/projects/smpng/sys/kern/subr_devstat.c#8 integrate .. //depot/projects/smpng/sys/kern/subr_disk.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#27 integrate .. //depot/projects/smpng/sys/kern/subr_smp.c#17 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#49 integrate .. //depot/projects/smpng/sys/kern/subr_xxx.c#7 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#26 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#27 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#26 integrate .. //depot/projects/smpng/sys/kern/tty.c#32 integrate .. //depot/projects/smpng/sys/kern/tty_pty.c#21 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#9 integrate .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#5 integrate .. //depot/projects/smpng/sys/kern/uipc_mbuf.c#15 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#32 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#22 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#11 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#46 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#36 integrate .. //depot/projects/smpng/sys/modules/Makefile#47 integrate .. //depot/projects/smpng/sys/modules/apm/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/atspeaker/Makefile#3 delete .. //depot/projects/smpng/sys/modules/bios/Makefile#1 branch .. //depot/projects/smpng/sys/modules/bios/smapi/Makefile#1 branch .. //depot/projects/smpng/sys/modules/bios/smbios/Makefile#1 branch .. //depot/projects/smpng/sys/modules/bios/vpd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/dpt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/elink/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ex/Makefile#1 branch .. //depot/projects/smpng/sys/modules/ie/Makefile#1 branch .. //depot/projects/smpng/sys/modules/mcd/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/pcspeaker/Makefile#2 delete .. //depot/projects/smpng/sys/modules/smapi/Makefile#3 delete .. //depot/projects/smpng/sys/modules/speaker/Makefile#1 branch .. //depot/projects/smpng/sys/net/if_ppp.c#20 integrate .. //depot/projects/smpng/sys/netinet/in.h#19 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#18 integrate .. //depot/projects/smpng/sys/netinet/ip.h#5 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#10 integrate .. //depot/projects/smpng/sys/netinet/ip_input.c#30 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#33 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#11 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#31 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#13 integrate .. //depot/projects/smpng/sys/netinet6/icmp6.c#13 integrate .. //depot/projects/smpng/sys/netinet6/nd6_rtr.c#6 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_mbuf.c#5 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/smpng/sys/netncp/ncp_ncp.c#7 integrate .. //depot/projects/smpng/sys/netsmb/smb_iod.c#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_rq.c#10 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#11 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.h#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_lock.c#22 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#17 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#26 integrate .. //depot/projects/smpng/sys/pc98/apm/apm.c#9 delete .. //depot/projects/smpng/sys/pc98/apm/apm.h#2 delete .. //depot/projects/smpng/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#49 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#22 integrate .. //depot/projects/smpng/sys/pc98/pc98/pc98gdc.c#7 integrate .. //depot/projects/smpng/sys/pc98/pc98/syscons.c#23 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd.c#10 integrate .. //depot/projects/smpng/sys/pc98/pc98/wd_cd.c#11 integrate .. //depot/projects/smpng/sys/pci/agp.c#12 integrate .. //depot/projects/smpng/sys/pci/if_dc.c#28 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#11 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#23 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#13 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#19 integrate .. //depot/projects/smpng/sys/pci/if_sk.c#12 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#15 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#21 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#10 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#11 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#11 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#21 integrate .. //depot/projects/smpng/sys/pci/meteor.c#7 integrate .. //depot/projects/smpng/sys/pci/xrpu.c#6 integrate .. //depot/projects/smpng/sys/powerpc/include/_types.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#34 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#31 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#13 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#3 integrate .. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#6 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#13 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#9 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#3 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#4 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#9 integrate .. //depot/projects/smpng/sys/sparc64/include/_types.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/fp.h#9 integrate .. //depot/projects/smpng/sys/sparc64/include/pcb.h#10 integrate .. //depot/projects/smpng/sys/sparc64/include/tte.h#12 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/db_trace.c#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/exception.S#8 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/genassym.c#27 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#44 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#35 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.S#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/swtch.S#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#47 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tsb.c#18 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#29 integrate .. //depot/projects/smpng/sys/sys/_types.h#9 integrate .. //depot/projects/smpng/sys/sys/acct.h#5 integrate .. //depot/projects/smpng/sys/sys/bio.h#13 integrate .. //depot/projects/smpng/sys/sys/conf.h#22 integrate .. //depot/projects/smpng/sys/sys/disk.h#11 integrate .. //depot/projects/smpng/sys/sys/jumbo.h#3 integrate .. //depot/projects/smpng/sys/sys/mac.h#14 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#12 integrate .. //depot/projects/smpng/sys/sys/malloc.h#16 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#19 integrate .. //depot/projects/smpng/sys/sys/mman.h#6 integrate .. //depot/projects/smpng/sys/sys/mount.h#21 integrate .. //depot/projects/smpng/sys/sys/msgbuf.h#6 integrate .. //depot/projects/smpng/sys/sys/param.h#36 integrate .. //depot/projects/smpng/sys/sys/proc.h#75 integrate .. //depot/projects/smpng/sys/sys/signal.h#13 integrate .. //depot/projects/smpng/sys/sys/signalvar.h#13 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#29 integrate .. //depot/projects/smpng/sys/sys/stat.h#13 integrate .. //depot/projects/smpng/sys/sys/syscall.h#27 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#27 integrate .. //depot/projects/smpng/sys/sys/sysctl.h#17 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#29 integrate .. //depot/projects/smpng/sys/sys/systm.h#40 integrate .. //depot/projects/smpng/sys/sys/thr.h#1 branch .. //depot/projects/smpng/sys/sys/types.h#23 integrate .. //depot/projects/smpng/sys/sys/ucred.h#20 integrate .. //depot/projects/smpng/sys/sys/umtx.h#1 branch .. //depot/projects/smpng/sys/ufs/ffs/ffs_rawread.c#1 branch .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#15 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#9 integrate .. //depot/projects/smpng/sys/vm/pmap.h#15 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#27 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#11 integrate .. //depot/projects/smpng/sys/vm/vm_extern.h#14 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#26 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#28 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#32 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#18 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#25 integrate .. //depot/projects/smpng/sys/vm/vm_pageq.c#8 integrate .. //depot/projects/smpng/sys/x86_64/include/_types.h#2 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#53 (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/alpha/alpha/machdep.c,v 1.196 2003/02/25 00:42:39 marcel Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.199 2003/04/01 00:18:54 jeff Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -1199,11 +1199,7 @@ * instruction to halt it in its tracks. */ PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); + sigexit(td, SIGILL); return; } @@ -1305,11 +1301,7 @@ * instruction to halt it in its tracks. */ PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); + sigexit(td, SIGILL); return; } @@ -1430,11 +1422,7 @@ * instruction to halt it in its tracks. */ PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); + sigexit(td, SIGILL); return; } @@ -1513,9 +1501,9 @@ * sigmask is stored in sc_reserved, sc_mask is only used for * backward compatibility. */ - SIGSETOLD(p->p_sigmask, ksc.sc_mask); - SIG_CANTMASK(p->p_sigmask); - signotify(p); + SIGSETOLD(td->td_sigmask, ksc.sc_mask); + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); @@ -1595,9 +1583,9 @@ p->p_sigstk.ss_flags &= ~SS_ONSTACK; #endif - p->p_sigmask = uc.uc_sigmask; - SIG_CANTMASK(p->p_sigmask); - signotify(p); + td->td_sigmask = uc.uc_sigmask; + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); /* XXX ksc.sc_ownedfp ? */ @@ -1671,9 +1659,9 @@ p->p_sigstk.ss_flags &= ~SS_ONSTACK; #endif - p->p_sigmask = uc.uc_sigmask; - SIG_CANTMASK(p->p_sigmask); - signotify(p); + td->td_sigmask = uc.uc_sigmask; + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); return (EJUSTRETURN); @@ -2336,3 +2324,9 @@ pcpu->pc_idlepcb.apcb_ptbr = thread0.td_pcb->pcb_hw.apcb_ptbr; pcpu->pc_current_asngen = 1; } + +intptr_t +casuptr(intptr_t *p, intptr_t old, intptr_t new) +{ + return (-1); +} ==== //depot/projects/smpng/sys/alpha/alpha/mem.c#10 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: Utah $Hdr: mem.c 1.13 89/10/08$ * from: @(#)mem.c 7.2 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.43 2003/03/03 12:15:38 phk Exp $ + * $FreeBSD: src/sys/alpha/alpha/mem.c,v 1.44 2003/03/25 00:06:59 jake Exp $ */ /* @@ -218,7 +218,7 @@ * instead of going through read/write * \*******************************************************/ static int -memmmap(dev_t dev, vm_offset_t offset, vm_offset_t *paddr, int prot) +memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot) { /* * /dev/mem is the only one that makes sense through this ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#44 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.109 2003/03/04 21:03:04 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.110 2003/03/31 22:02:36 jeff Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -584,7 +584,7 @@ framep->tf_regs[FRAME_TRAPARG_A0] = a0; framep->tf_regs[FRAME_TRAPARG_A1] = a1; framep->tf_regs[FRAME_TRAPARG_A2] = a2; - trapsignal(p, i, ucode); + trapsignal(td, i, ucode); out: if (user) { framep->tf_regs[FRAME_SP] = alpha_pal_rdusp(); ==== //depot/projects/smpng/sys/alpha/include/_types.h#3 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/alpha/include/_types.h,v 1.3 2003/02/08 20:37:54 mike Exp $ + * $FreeBSD: src/sys/alpha/include/_types.h,v 1.4 2003/03/25 00:07:00 jake Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -89,6 +89,7 @@ typedef __uint64_t __u_register_t; typedef __uint64_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; +typedef __uint64_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; typedef __uint64_t __vm_size_t; ==== //depot/projects/smpng/sys/alpha/include/param.h#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/param.h,v 1.29 2002/09/17 01:48:54 peter Exp $ */ +/* $FreeBSD: src/sys/alpha/include/param.h,v 1.30 2003/03/29 18:22:29 gallatin Exp $ */ /* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */ /* @@ -91,8 +91,9 @@ #include <machine/alpha_cpu.h> #include <machine/cpu.h> +#define MAXSMPCPU 8 #ifdef SMP -#define MAXCPU 32 +#define MAXCPU MAXSMPCPU #else #define MAXCPU 1 #endif ==== //depot/projects/smpng/sys/alpha/include/pmap.h#14 (text+ko) ==== @@ -43,7 +43,7 @@ * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 * from: i386 pmap.h,v 1.54 1997/11/20 19:30:35 bde Exp - * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.21 2003/03/16 04:16:02 jake Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.22 2003/03/29 18:22:29 gallatin Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -176,7 +176,7 @@ struct { u_int32_t asn:ASN_BITS; /* address space number */ u_int32_t gen:ASNGEN_BITS; /* generation number */ - } pm_asn[MAXCPU]; + } pm_asn[MAXSMPCPU]; struct pmap_statistics pm_stats; /* pmap statistics */ struct vm_page *pm_ptphint; /* pmap ptp hint */ LIST_ENTRY(pmap) pm_list; /* list of all pmaps. */ ==== //depot/projects/smpng/sys/alpha/linux/linux_sysvec.c#12 (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/alpha/linux/linux_sysvec.c,v 1.85 2003/03/21 19:49:33 jhb Exp $ + * $FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.87 2003/03/27 18:18:35 jhb Exp $ */ /* XXX we use functions that might not exist. */ @@ -60,6 +60,7 @@ #include <alpha/linux/linux.h> #include <alpha/linux/linux_proto.h> +#include <compat/linux/linux_mib.h> #include <compat/linux/linux_util.h> #undef szsigcode @@ -258,6 +259,7 @@ linux_ioctl_unregister_handler(*lihp); if (bootverbose) printf("Linux ELF exec handler removed\n"); + linux_mib_destroy(); } else printf("Could not deinstall ELF interpreter entry\n"); break; ==== //depot/projects/smpng/sys/alpha/osf1/osf1_signal.c#16 (text+ko) ==== @@ -30,7 +30,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/alpha/osf1/osf1_signal.c,v 1.27 2003/02/20 20:54:43 phk Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.29 2003/03/31 22:49:14 jeff Exp $ */ #include "opt_compat.h" @@ -451,7 +451,7 @@ bmask = stackgap_alloc(&sg, sizeof(sigset_t)); PROC_LOCK(p); - set = p->p_sigmask; + set = td->td_sigmask; PROC_UNLOCK(p); SIGDELSET(set, signum); sa.sigmask = bmask; @@ -481,7 +481,7 @@ p = td->td_proc; error = 0; /* Fix the return value first if needed */ - bsd_to_osf1_sigset(&p->p_sigmask, &oss); + bsd_to_osf1_sigset(&td->td_sigmask, &oss); td->td_retval[0] = oss; osf1_to_bsd_sigset(&uap->mask, &bss); @@ -490,19 +490,19 @@ switch (uap->how) { case OSF1_SIG_BLOCK: - SIGSETOR(p->p_sigmask, bss); - SIG_CANTMASK(p->p_sigmask); + SIGSETOR(td->td_sigmask, bss); + SIG_CANTMASK(td->td_sigmask); break; case OSF1_SIG_UNBLOCK: - SIGSETNAND(p->p_sigmask, bss); - signotify(p); + SIGSETNAND(td->td_sigmask, bss); + signotify(td); break; case OSF1_SIG_SETMASK: - p->p_sigmask = bss; - SIG_CANTMASK(p->p_sigmask); - signotify(p); + td->td_sigmask = bss; + SIG_CANTMASK(td->td_sigmask); + signotify(td); break; default: @@ -528,8 +528,9 @@ p = td->td_proc; PROC_LOCK(p); - bss = p->p_siglist; - SIGSETAND(bss, p->p_sigmask); + bss = td->td_siglist; + SIGSETOR(bss, p->p_siglist); + SIGSETAND(bss, td->td_sigmask); PROC_UNLOCK(p); bsd_to_osf1_sigset(&bss, &oss); @@ -663,11 +664,7 @@ * instruction to halt it in its tracks. */ PROC_LOCK(p); - SIGACTION(p, SIGILL) = SIG_DFL; - SIGDELSET(p->p_sigignore, SIGILL); - SIGDELSET(p->p_sigcatch, SIGILL); - SIGDELSET(p->p_sigmask, SIGILL); - psignal(p, SIGILL); + sigexit(td, SIGILL); return; } @@ -731,9 +728,9 @@ * sigmask is stored in sc_reserved, sc_mask is only used for * backward compatibility. */ - osf1_to_bsd_sigset(&ksc.sc_mask, &p->p_sigmask); - SIG_CANTMASK(p->p_sigmask); - signotify(p); + osf1_to_bsd_sigset(&ksc.sc_mask, &td->td_sigmask); + SIG_CANTMASK(td->td_sigmask); + signotify(td); PROC_UNLOCK(p); set_regs(td, (struct reg *)ksc.sc_regs); ==== //depot/projects/smpng/sys/arm/include/_types.h#2 (text+ko) ==== @@ -33,7 +33,7 @@ * * From: @(#)ansi.h 8.2 (Berkeley) 1/4/94 * From: @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/_types.h,v 1.2 2002/08/23 16:49:04 mike Exp $ + * $FreeBSD: src/sys/arm/include/_types.h,v 1.3 2003/03/25 00:07:00 jake Exp $ */ #ifndef _MACHINE__TYPES_H_ @@ -95,6 +95,7 @@ typedef __uint32_t __u_register_t; typedef __uint32_t __vm_offset_t; typedef __int64_t __vm_ooffset_t; +typedef __uint32_t __vm_paddr_t; typedef __uint64_t __vm_pindex_t; typedef __uint32_t __vm_size_t; ==== //depot/projects/smpng/sys/cam/scsi/scsi_cd.c#16 (text+ko) ==== @@ -24,7 +24,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.76 2003/03/15 11:00:56 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.78 2003/04/01 15:06:21 phk Exp $ */ /* * Portions of this driver taken from the original FreeBSD cd driver. @@ -394,7 +394,6 @@ { int s; struct cd_softc *softc; - struct bio *q_bp; struct ccb_setasync csa; softc = (struct cd_softc *)periph->softc; @@ -424,11 +423,7 @@ * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL){ - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, ENXIO); - } + bioq_flush(&softc->bio_queue, NULL, ENXIO); splx(s); /* @@ -455,6 +450,11 @@ xpt_print_path(periph->path); printf("removing device entry\n"); + if (sysctl_ctx_free(&softc->sysctl_ctx) != 0) { + xpt_print_path(periph->path); + printf("can't remove sysctl context\n"); + } + s = splsoftcam(); /* * In the queued, non-active case, the device in question @@ -688,6 +688,7 @@ snprintf(tmpstr, sizeof(tmpstr), "CAM CD unit %d", periph->unit_number); snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); + sysctl_ctx_init(&softc->sysctl_ctx); softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, SYSCTL_STATIC_CHILDREN(_kern_cam_cd), OID_AUTO, tmpstr2, CTLFLAG_RD, 0, tmpstr); @@ -1458,7 +1459,7 @@ /* * Place it in the queue of disk activities for this disk */ - bioqdisksort(&softc->bio_queue, bp); + bioq_disksort(&softc->bio_queue, bp); splx(s); @@ -1624,16 +1625,11 @@ if (error != 0) { int s; - struct bio *q_bp; xpt_print_path(periph->path); printf("cddone: got error %#x back\n", error); s = splbio(); - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL) { - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, EIO); - } + bioq_flush(&softc->bio_queue, NULL, EIO); splx(s); bp->bio_resid = bp->bio_bcount; bp->bio_error = error; ==== //depot/projects/smpng/sys/cam/scsi/scsi_da.c#35 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.134 2003/03/15 11:00:56 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.136 2003/04/01 15:06:21 phk Exp $ */ #ifdef _KERNEL @@ -43,7 +43,6 @@ #include <sys/devicestat.h> #include <sys/conf.h> -#include <sys/disk.h> #include <sys/eventhandler.h> #include <sys/malloc.h> #include <sys/cons.h> @@ -53,6 +52,8 @@ #include <vm/vm.h> #include <vm/pmap.h> +#include <geom/geom_disk.h> + #ifndef _KERNEL #include <stdio.h> #include <string.h> @@ -750,7 +751,7 @@ /* * Place it in the queue of disk activities for this disk */ - bioqdisksort(&softc->bio_queue, bp); + bioq_disksort(&softc->bio_queue, bp); splx(s); @@ -935,7 +936,6 @@ { int s; struct da_softc *softc; - struct bio *q_bp; struct ccb_setasync csa; softc = (struct da_softc *)periph->softc; @@ -965,11 +965,7 @@ * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL){ - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, ENXIO); - } + bioq_flush(&softc->bio_queue, NULL, ENXIO); splx(s); SLIST_REMOVE(&softc_list, softc, da_softc, links); @@ -987,6 +983,13 @@ xpt_print_path(periph->path); printf("removing device entry\n"); + /* + * If we can't free the sysctl tree, oh well... + */ + if (sysctl_ctx_free(&softc->sysctl_ctx) != 0) { + xpt_print_path(periph->path); + printf("can't remove sysctl context\n"); + } disk_destroy(&softc->disk); free(softc, M_DEVBUF); } @@ -1142,6 +1145,7 @@ snprintf(tmpstr, sizeof(tmpstr), "CAM DA unit %d", periph->unit_number); snprintf(tmpstr2, sizeof(tmpstr2), "%d", periph->unit_number); + sysctl_ctx_init(&softc->sysctl_ctx); softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, SYSCTL_STATIC_CHILDREN(_kern_cam_da), OID_AUTO, tmpstr2, CTLFLAG_RD, 0, tmpstr); @@ -1430,7 +1434,6 @@ return; } if (error != 0) { - struct bio *q_bp; s = splbio(); @@ -1452,12 +1455,7 @@ * the client can retry these I/Os in the * proper order should it attempt to recover. */ - while ((q_bp = bioq_first(&softc->bio_queue)) - != NULL) { - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, EIO); - } + bioq_flush(&softc->bio_queue, NULL, EIO); splx(s); bp->bio_error = error; bp->bio_resid = bp->bio_bcount; ==== //depot/projects/smpng/sys/cam/scsi/scsi_pt.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.36 2003/03/15 10:50:42 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_pt.c,v 1.37 2003/04/01 15:06:22 phk Exp $ */ #include <sys/param.h> @@ -353,7 +353,6 @@ { int s; struct pt_softc *softc; - struct bio *q_bp; struct ccb_setasync csa; softc = (struct pt_softc *)periph->softc; @@ -383,11 +382,7 @@ * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL){ - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, ENXIO); - } + bioq_flush(&softc->bio_queue, NULL, ENXIO); splx(s); @@ -574,8 +569,6 @@ return; } if (error != 0) { - struct bio *q_bp; - s = splbio(); if (error == ENXIO) { @@ -593,12 +586,7 @@ * the client can retry these I/Os in the * proper order should it attempt to recover. */ - while ((q_bp = bioq_first(&softc->bio_queue)) - != NULL) { - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, EIO); - } + bioq_flush(&softc->bio_queue, NULL, EIO); splx(s); bp->bio_error = error; bp->bio_resid = bp->bio_bcount; ==== //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#13 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.91 2003/03/15 10:50:42 phk Exp $ + * $FreeBSD: src/sys/cam/scsi/scsi_sa.c,v 1.92 2003/04/01 15:06:22 phk Exp $ * * Implementation of SCSI Sequential Access Peripheral driver for CAM. * @@ -1281,7 +1281,6 @@ saoninvalidate(struct cam_periph *periph) { struct sa_softc *softc; - struct bio *q_bp; struct ccb_setasync csa; int s; @@ -1312,11 +1311,7 @@ * XXX Handle any transactions queued to the card * with XPT_ABORT_CCB. */ - while ((q_bp = bioq_first(&softc->bio_queue)) != NULL){ - bioq_remove(&softc->bio_queue, q_bp); - q_bp->bio_resid = q_bp->bio_bcount; - biofinish(q_bp, NULL, ENXIO); - } + bioq_flush(&softc->bio_queue, NULL, ENXIO); softc->queue_count = 0; splx(s); @@ -1698,7 +1693,6 @@ if (error == EIO) { int s; - struct bio *q_bp; /* * Catastrophic error. Mark the tape as frozen @@ -1713,11 +1707,7 @@ s = splbio(); softc->flags |= SA_FLAG_TAPE_FROZEN; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200304021604.h32G40XC094213>