Date: Sat, 18 Oct 2003 21:55:22 -0700 (PDT) From: Marcel Moolenaar <marcel@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 39955 for review Message-ID: <200310190455.h9J4tM5e092035@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=39955 Change 39955 by marcel@marcel_nfs on 2003/10/18 21:54:44 IFC @39953 Affected files ... .. //depot/projects/uart/alpha/alpha/machdep.c#8 integrate .. //depot/projects/uart/alpha/alpha/trap.c#3 integrate .. //depot/projects/uart/alpha/include/pmap.h#2 integrate .. //depot/projects/uart/amd64/amd64/exception.S#4 integrate .. //depot/projects/uart/amd64/amd64/machdep.c#7 integrate .. //depot/projects/uart/amd64/amd64/pmap.c#20 integrate .. //depot/projects/uart/amd64/amd64/trap.c#4 integrate .. //depot/projects/uart/amd64/amd64/uma_machdep.c#1 branch .. //depot/projects/uart/amd64/include/frame.h#2 integrate .. //depot/projects/uart/amd64/include/pmap.h#4 integrate .. //depot/projects/uart/amd64/include/signal.h#3 integrate .. //depot/projects/uart/amd64/include/ucontext.h#4 integrate .. //depot/projects/uart/cam/cam_periph.c#4 integrate .. //depot/projects/uart/cam/scsi/scsi_cd.c#6 integrate .. //depot/projects/uart/cam/scsi/scsi_da.c#9 integrate .. //depot/projects/uart/coda/coda_subr.c#3 integrate .. //depot/projects/uart/compat/linprocfs/linprocfs.c#8 integrate .. //depot/projects/uart/compat/linux/linux_socket.c#2 integrate .. //depot/projects/uart/conf/files#27 integrate .. //depot/projects/uart/conf/files.amd64#7 integrate .. //depot/projects/uart/conf/majors#5 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/Makefile#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx.h#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_context.c#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_env.h#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_scoreboard.c#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_self.c#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_step.c#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_step.h#1 branch .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_trace.c#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_trace.h#3 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_ttrace.c#2 integrate .. //depot/projects/uart/contrib/ia64/libuwx/src/uwx_uinfo.c#3 integrate .. //depot/projects/uart/contrib/ipfilter/netinet/ip_fil.c#3 integrate .. //depot/projects/uart/crypto/blowfish/bf_ecb.c#1 branch .. //depot/projects/uart/crypto/blowfish/blowfish.h#2 integrate .. //depot/projects/uart/crypto/cast128/cast128.c#2 integrate .. //depot/projects/uart/crypto/cast128/cast128.h#2 integrate .. //depot/projects/uart/crypto/cast128/cast128_subkey.h#2 delete .. //depot/projects/uart/crypto/cast128/cast128sb.h#1 branch .. //depot/projects/uart/crypto/rijndael/boxes-fst.dat#2 delete .. //depot/projects/uart/crypto/rijndael/rijndael-alg-fst.c#2 integrate .. //depot/projects/uart/crypto/rijndael/rijndael-alg-fst.h#2 integrate .. //depot/projects/uart/crypto/rijndael/rijndael-api-fst.c#4 integrate .. //depot/projects/uart/crypto/rijndael/rijndael-api-fst.h#2 integrate .. //depot/projects/uart/crypto/rijndael/rijndael_local.h#2 integrate .. //depot/projects/uart/dev/aac/aac.c#9 integrate .. //depot/projects/uart/dev/aac/aacreg.h#2 integrate .. //depot/projects/uart/dev/amr/amr.c#4 integrate .. //depot/projects/uart/dev/amr/amr_disk.c#3 integrate .. //depot/projects/uart/dev/amr/amrvar.h#2 integrate .. //depot/projects/uart/dev/an/if_an_pccard.c#3 integrate .. //depot/projects/uart/dev/ata/ata-all.c#8 integrate .. //depot/projects/uart/dev/ata/ata-card.c#4 integrate .. //depot/projects/uart/dev/ata/ata-disk.c#4 integrate .. //depot/projects/uart/dev/ata/ata-dma.c#6 integrate .. //depot/projects/uart/dev/ata/ata-lowlevel.c#11 integrate .. //depot/projects/uart/dev/ata/ata-queue.c#5 integrate .. //depot/projects/uart/dev/ata/atapi-cd.c#9 integrate .. //depot/projects/uart/dev/ath/if_ath.c#11 integrate .. //depot/projects/uart/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/uart/dev/ath/if_athvar.h#7 integrate .. //depot/projects/uart/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/uart/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/uart/dev/cardbus/cardbus_cis.h#2 integrate .. //depot/projects/uart/dev/ciss/ciss.c#7 integrate .. //depot/projects/uart/dev/ed/if_ed.c#3 integrate .. //depot/projects/uart/dev/ed/if_ed_cbus.c#3 integrate .. //depot/projects/uart/dev/ed/if_ed_isa.c#3 integrate .. //depot/projects/uart/dev/ed/if_edreg.h#2 integrate .. //depot/projects/uart/dev/ed/if_edvar.h#2 integrate .. //depot/projects/uart/dev/em/if_em.c#6 integrate .. //depot/projects/uart/dev/em/if_em.h#8 integrate .. //depot/projects/uart/dev/ep/if_ep.c#6 integrate .. //depot/projects/uart/dev/ep/if_ep_eisa.c#4 integrate .. //depot/projects/uart/dev/ep/if_ep_isa.c#5 integrate .. //depot/projects/uart/dev/ep/if_ep_pccard.c#5 integrate .. //depot/projects/uart/dev/ep/if_epreg.h#3 integrate .. //depot/projects/uart/dev/ep/if_epvar.h#3 integrate .. //depot/projects/uart/dev/exca/exca.c#6 integrate .. //depot/projects/uart/dev/firewire/firewire.c#8 integrate .. //depot/projects/uart/dev/firewire/sbp.c#10 integrate .. //depot/projects/uart/dev/firewire/sbp_targ.c#1 branch .. //depot/projects/uart/dev/hifn/hifn7751.c#7 integrate .. //depot/projects/uart/dev/hifn/hifn7751reg.h#3 integrate .. //depot/projects/uart/dev/hifn/hifn7751var.h#2 integrate .. //depot/projects/uart/dev/ips/ips_commands.c#4 integrate .. //depot/projects/uart/dev/kbd/atkbd.c#5 integrate .. //depot/projects/uart/dev/matcd/matcd.c#3 integrate .. //depot/projects/uart/dev/mcd/mcd.c#3 integrate .. //depot/projects/uart/dev/md/md.c#5 integrate .. //depot/projects/uart/dev/null/null.c#4 integrate .. //depot/projects/uart/dev/ofw/ofw_disk.c#3 integrate .. //depot/projects/uart/dev/owi/if_owi.c#2 integrate .. //depot/projects/uart/dev/pccard/card_if.m#2 integrate .. //depot/projects/uart/dev/pccard/pccard.c#6 integrate .. //depot/projects/uart/dev/pccard/pccard_cis.c#4 integrate .. //depot/projects/uart/dev/pccard/pccard_cis.h#1 branch .. //depot/projects/uart/dev/pccard/pccard_cis_quirks.c#3 integrate .. //depot/projects/uart/dev/pccard/pccarddevs#10 integrate .. //depot/projects/uart/dev/pccard/pccarddevs.h#10 integrate .. //depot/projects/uart/dev/pccard/pccardreg.h#2 integrate .. //depot/projects/uart/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/uart/dev/pci/pci_user.c#4 integrate .. //depot/projects/uart/dev/raidframe/rf_freebsdkintf.c#5 integrate .. //depot/projects/uart/dev/scd/scd.c#3 integrate .. //depot/projects/uart/dev/sio/sio_pccard.c#4 integrate .. //depot/projects/uart/dev/sound/pci/au88x0.c#5 integrate .. //depot/projects/uart/dev/sound/pci/au88x0.h#2 integrate .. //depot/projects/uart/dev/sound/pcm/ac97.c#6 integrate .. //depot/projects/uart/dev/uart/uart_bus_pccard.c#5 integrate .. //depot/projects/uart/dev/usb/if_aue.c#6 integrate .. //depot/projects/uart/dev/usb/if_auereg.h#2 integrate .. //depot/projects/uart/dev/usb/if_cue.c#5 integrate .. //depot/projects/uart/dev/usb/if_cuereg.h#2 integrate .. //depot/projects/uart/dev/usb/if_kue.c#4 integrate .. //depot/projects/uart/dev/usb/if_kuereg.h#2 integrate .. //depot/projects/uart/dev/usb/if_rue.c#4 integrate .. //depot/projects/uart/dev/usb/if_ruereg.h#2 integrate .. //depot/projects/uart/dev/usb/ubsa.c#4 integrate .. //depot/projects/uart/dev/usb/ufm.c#5 integrate .. //depot/projects/uart/dev/usb/ugen.c#8 integrate .. //depot/projects/uart/dev/usb/uhid.c#7 integrate .. //depot/projects/uart/dev/usb/ukbd.c#4 integrate .. //depot/projects/uart/dev/usb/ums.c#6 integrate .. //depot/projects/uart/dev/usb/usb.c#5 integrate .. //depot/projects/uart/dev/usb/usb_mem.c#5 integrate .. //depot/projects/uart/dev/usb/usb_port.h#5 integrate .. //depot/projects/uart/dev/usb/usbdevs#8 integrate .. //depot/projects/uart/dev/usb/usbdevs.h#7 integrate .. //depot/projects/uart/dev/usb/usbdevs_data.h#7 integrate .. //depot/projects/uart/dev/vinum/vinumrequest.c#3 integrate .. //depot/projects/uart/dev/xe/if_xe.c#3 integrate .. //depot/projects/uart/dev/xe/if_xe_pccard.c#4 integrate .. //depot/projects/uart/dev/xe/if_xereg.h#2 integrate .. //depot/projects/uart/dev/xe/if_xevar.h#2 integrate .. //depot/projects/uart/fs/hpfs/hpfs_vnops.c#2 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_denode.c#2 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/uart/fs/msdosfs/msdosfs_vnops.c#5 integrate .. //depot/projects/uart/fs/ntfs/ntfs_vnops.c#3 integrate .. //depot/projects/uart/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/uart/fs/nwfs/nwfs_node.c#2 integrate .. //depot/projects/uart/fs/nwfs/nwfs_vnops.c#2 integrate .. //depot/projects/uart/fs/pseudofs/pseudofs_vncache.c#2 integrate .. //depot/projects/uart/fs/smbfs/smbfs_io.c#4 integrate .. //depot/projects/uart/fs/smbfs/smbfs_node.c#2 integrate .. //depot/projects/uart/fs/smbfs/smbfs_vnops.c#4 integrate .. //depot/projects/uart/fs/specfs/spec_vnops.c#5 integrate .. //depot/projects/uart/fs/udf/udf_vnops.c#2 integrate .. //depot/projects/uart/geom/bde/g_bde.h#2 integrate .. //depot/projects/uart/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/uart/geom/geom.h#4 integrate .. //depot/projects/uart/geom/geom_dev.c#7 integrate .. //depot/projects/uart/geom/geom_disk.c#5 integrate .. //depot/projects/uart/geom/geom_event.c#2 integrate .. //depot/projects/uart/geom/geom_io.c#5 integrate .. //depot/projects/uart/geom/geom_subr.c#3 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_bmap.c#2 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_inode.c#2 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_vfsops.c#4 integrate .. //depot/projects/uart/gnu/ext2fs/ext2_vnops.c#2 integrate .. //depot/projects/uart/i386/i386/locore.s#5 integrate .. //depot/projects/uart/i386/i386/machdep.c#7 integrate .. //depot/projects/uart/i386/i386/pmap.c#21 integrate .. //depot/projects/uart/i386/i386/trap.c#5 integrate .. //depot/projects/uart/i386/i386/vm_machdep.c#5 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_misc.c#2 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_signal.c#2 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_socksys.c#2 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_util.c#2 integrate .. //depot/projects/uart/i386/ibcs2/ibcs2_util.h#2 integrate .. //depot/projects/uart/i386/ibcs2/imgact_coff.c#3 integrate .. //depot/projects/uart/i386/include/pmap.h#4 integrate .. //depot/projects/uart/i386/isa/apic_vector.s#3 integrate .. //depot/projects/uart/i386/isa/isa_compat.c#3 integrate .. //depot/projects/uart/ia64/ia64/machdep.c#15 integrate .. //depot/projects/uart/ia64/ia64/pmap.c#13 integrate .. //depot/projects/uart/ia64/ia64/trap.c#8 integrate .. //depot/projects/uart/ia64/ia64/unwind.c#4 integrate .. //depot/projects/uart/ia64/include/pmap.h#2 integrate .. //depot/projects/uart/isa/fd.c#6 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_node.c#2 integrate .. //depot/projects/uart/isofs/cd9660/cd9660_vnops.c#3 integrate .. //depot/projects/uart/kern/kern_clock.c#2 integrate .. //depot/projects/uart/kern/kern_exec.c#5 integrate .. //depot/projects/uart/kern/kern_idle.c#2 integrate .. //depot/projects/uart/kern/kern_physio.c#3 integrate .. //depot/projects/uart/kern/kern_poll.c#2 integrate .. //depot/projects/uart/kern/kern_proc.c#6 integrate .. //depot/projects/uart/kern/kern_sig.c#11 integrate .. //depot/projects/uart/kern/kern_switch.c#2 integrate .. //depot/projects/uart/kern/kern_synch.c#6 integrate .. //depot/projects/uart/kern/kern_sysctl.c#2 integrate .. //depot/projects/uart/kern/sched_4bsd.c#4 integrate .. //depot/projects/uart/kern/sched_ule.c#7 integrate .. //depot/projects/uart/kern/subr_bus.c#4 integrate .. //depot/projects/uart/kern/subr_disk.c#2 integrate .. //depot/projects/uart/kern/subr_kobj.c#3 integrate .. //depot/projects/uart/kern/sys_pipe.c#10 integrate .. //depot/projects/uart/kern/sys_process.c#5 integrate .. //depot/projects/uart/kern/tty_cons.c#4 integrate .. //depot/projects/uart/kern/vfs_bio.c#8 integrate .. //depot/projects/uart/kern/vfs_cache.c#2 integrate .. //depot/projects/uart/kern/vfs_cluster.c#4 integrate .. //depot/projects/uart/kern/vfs_subr.c#5 integrate .. //depot/projects/uart/kern/vfs_vnops.c#4 integrate .. //depot/projects/uart/modules/firewire/Makefile#2 integrate .. //depot/projects/uart/modules/firewire/sbp_targ/Makefile#1 branch .. //depot/projects/uart/modules/netgraph/bluetooth/bluetooth/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/bt3c/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/h4/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/hci/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/l2cap/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/socket/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/ubt/Makefile#2 integrate .. //depot/projects/uart/modules/netgraph/bluetooth/ubtbcmfw/Makefile#2 integrate .. //depot/projects/uart/net/if.c#5 integrate .. //depot/projects/uart/net/if_ethersubr.c#5 integrate .. //depot/projects/uart/net/if_var.h#2 integrate .. //depot/projects/uart/net/net_osdep.c#2 integrate .. //depot/projects/uart/net/pfkeyv2.h#2 integrate .. //depot/projects/uart/net/route.c#3 integrate .. //depot/projects/uart/net80211/ieee80211_crypto.c#2 integrate .. //depot/projects/uart/net80211/ieee80211_input.c#6 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.c#6 integrate .. //depot/projects/uart/net80211/ieee80211_ioctl.h#3 integrate .. //depot/projects/uart/net80211/ieee80211_node.c#8 integrate .. //depot/projects/uart/net80211/ieee80211_node.h#6 integrate .. //depot/projects/uart/net80211/ieee80211_output.c#6 integrate .. //depot/projects/uart/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/uart/net80211/ieee80211_var.h#6 integrate .. //depot/projects/uart/netgraph/bluetooth/drivers/ubt/ng_ubt.c#4 integrate .. //depot/projects/uart/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate .. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_cmds.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_evnt.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_misc.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_misc.h#2 integrate .. //depot/projects/uart/netgraph/bluetooth/hci/ng_hci_ulpi.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_cmds.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_evnt.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_llpi.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_misc.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/l2cap/ng_l2cap_misc.h#2 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#2 integrate .. //depot/projects/uart/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#2 integrate .. //depot/projects/uart/netinet/icmp6.h#3 integrate .. //depot/projects/uart/netinet/in_gif.c#2 integrate .. //depot/projects/uart/netinet/in_gif.h#2 integrate .. //depot/projects/uart/netinet/in_rmx.c#3 integrate .. //depot/projects/uart/netinet/ip_dummynet.c#5 integrate .. //depot/projects/uart/netinet/ip_fw2.c#8 integrate .. //depot/projects/uart/netinet/ip_input.c#5 integrate .. //depot/projects/uart/netinet/ip_var.h#5 integrate .. //depot/projects/uart/netinet/tcp_input.c#4 integrate .. //depot/projects/uart/netinet6/ah.h#2 integrate .. //depot/projects/uart/netinet6/ah6.h#2 integrate .. //depot/projects/uart/netinet6/ah_aesxcbcmac.c#1 branch .. //depot/projects/uart/netinet6/ah_aesxcbcmac.h#1 branch .. //depot/projects/uart/netinet6/ah_core.c#2 integrate .. //depot/projects/uart/netinet6/ah_input.c#2 integrate .. //depot/projects/uart/netinet6/ah_output.c#2 integrate .. //depot/projects/uart/netinet6/dest6.c#2 integrate .. //depot/projects/uart/netinet6/esp.h#2 integrate .. //depot/projects/uart/netinet6/esp_aesctr.c#1 branch .. //depot/projects/uart/netinet6/esp_aesctr.h#1 branch .. //depot/projects/uart/netinet6/esp_core.c#2 integrate .. //depot/projects/uart/netinet6/esp_input.c#2 integrate .. //depot/projects/uart/netinet6/esp_output.c#2 integrate .. //depot/projects/uart/netinet6/esp_rijndael.c#2 integrate .. //depot/projects/uart/netinet6/esp_rijndael.h#2 integrate .. //depot/projects/uart/netinet6/frag6.c#3 integrate .. //depot/projects/uart/netinet6/icmp6.c#3 integrate .. //depot/projects/uart/netinet6/in6.c#3 integrate .. //depot/projects/uart/netinet6/in6.h#2 integrate .. //depot/projects/uart/netinet6/in6_cksum.c#2 integrate .. //depot/projects/uart/netinet6/in6_gif.c#2 integrate .. //depot/projects/uart/netinet6/in6_gif.h#2 integrate .. //depot/projects/uart/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/uart/netinet6/in6_pcb.c#4 integrate .. //depot/projects/uart/netinet6/in6_prefix.c#2 integrate .. //depot/projects/uart/netinet6/in6_proto.c#3 integrate .. //depot/projects/uart/netinet6/in6_rmx.c#3 integrate .. //depot/projects/uart/netinet6/in6_src.c#3 integrate .. //depot/projects/uart/netinet6/in6_var.h#2 integrate .. //depot/projects/uart/netinet6/ip6_forward.c#4 integrate .. //depot/projects/uart/netinet6/ip6_fw.c#3 integrate .. //depot/projects/uart/netinet6/ip6_fw.h#2 integrate .. //depot/projects/uart/netinet6/ip6_input.c#4 integrate .. //depot/projects/uart/netinet6/ip6_mroute.c#2 integrate .. //depot/projects/uart/netinet6/ip6_output.c#4 integrate .. //depot/projects/uart/netinet6/ip6_var.h#4 integrate .. //depot/projects/uart/netinet6/ip6protosw.h#3 integrate .. //depot/projects/uart/netinet6/ipcomp_core.c#2 integrate .. //depot/projects/uart/netinet6/ipcomp_input.c#2 integrate .. //depot/projects/uart/netinet6/ipsec.c#3 integrate .. //depot/projects/uart/netinet6/ipsec.h#2 integrate .. //depot/projects/uart/netinet6/mld6.c#2 integrate .. //depot/projects/uart/netinet6/mld6_var.h#2 integrate .. //depot/projects/uart/netinet6/nd6.c#5 integrate .. //depot/projects/uart/netinet6/nd6.h#3 integrate .. //depot/projects/uart/netinet6/nd6_nbr.c#3 integrate .. //depot/projects/uart/netinet6/nd6_rtr.c#4 integrate .. //depot/projects/uart/netinet6/raw_ip6.c#2 integrate .. //depot/projects/uart/netinet6/route6.c#2 integrate .. //depot/projects/uart/netinet6/scope6.c#2 integrate .. //depot/projects/uart/netinet6/scope6_var.h#2 integrate .. //depot/projects/uart/netinet6/udp6_output.c#2 integrate .. //depot/projects/uart/netinet6/udp6_usrreq.c#2 integrate .. //depot/projects/uart/netkey/key_var.h#2 integrate .. //depot/projects/uart/nfsclient/bootp_subr.c#5 integrate .. //depot/projects/uart/nfsclient/krpc_subr.c#2 integrate .. //depot/projects/uart/nfsclient/nfs_bio.c#3 integrate .. //depot/projects/uart/nfsclient/nfs_node.c#3 integrate .. //depot/projects/uart/nfsclient/nfs_socket.c#2 integrate .. //depot/projects/uart/nfsclient/nfs_subs.c#3 integrate .. //depot/projects/uart/nfsclient/nfs_vfsops.c#3 integrate .. //depot/projects/uart/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/uart/nfsserver/nfs_syscalls.c#3 integrate .. //depot/projects/uart/pc98/i386/machdep.c#5 integrate .. //depot/projects/uart/pc98/pc98/clock.c#6 integrate .. //depot/projects/uart/pc98/pc98/fd.c#6 integrate .. //depot/projects/uart/pc98/pc98/sio.c#6 integrate .. //depot/projects/uart/pc98/pc98/wd.c#2 integrate .. //depot/projects/uart/pc98/pc98/wd_cd.c#2 integrate .. //depot/projects/uart/pci/if_dc.c#14 integrate .. //depot/projects/uart/pci/if_dcreg.h#6 integrate .. //depot/projects/uart/pci/if_ti.c#4 integrate .. //depot/projects/uart/powerpc/include/pmap.h#2 integrate .. //depot/projects/uart/powerpc/powerpc/machdep.c#4 integrate .. //depot/projects/uart/sparc64/include/pmap.h#2 integrate .. //depot/projects/uart/sparc64/sparc64/machdep.c#6 integrate .. //depot/projects/uart/sparc64/sparc64/trap.c#3 integrate .. //depot/projects/uart/sys/bio.h#2 integrate .. //depot/projects/uart/sys/buf.h#5 integrate .. //depot/projects/uart/sys/bus.h#4 integrate .. //depot/projects/uart/sys/conf.h#4 integrate .. //depot/projects/uart/sys/cons.h#4 integrate .. //depot/projects/uart/sys/domain.h#2 integrate .. //depot/projects/uart/sys/endian.h#2 integrate .. //depot/projects/uart/sys/kernel.h#4 integrate .. //depot/projects/uart/sys/kobj.h#3 integrate .. //depot/projects/uart/sys/mutex.h#5 integrate .. //depot/projects/uart/sys/param.h#12 integrate .. //depot/projects/uart/sys/proc.h#8 integrate .. //depot/projects/uart/sys/ptrace.h#3 integrate .. //depot/projects/uart/sys/sched.h#2 integrate .. //depot/projects/uart/sys/sysctl.h#4 integrate .. //depot/projects/uart/sys/vnode.h#4 integrate .. //depot/projects/uart/tools/makeobjops.awk#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_inode.c#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_snapshot.c#2 integrate .. //depot/projects/uart/ufs/ffs/ffs_softdep.c#5 integrate .. //depot/projects/uart/ufs/ffs/ffs_vfsops.c#4 integrate .. //depot/projects/uart/ufs/ffs/ffs_vnops.c#4 integrate .. //depot/projects/uart/ufs/ufs/ufs_bmap.c#2 integrate .. //depot/projects/uart/ufs/ufs/ufs_ihash.c#2 integrate .. //depot/projects/uart/ufs/ufs/ufs_inode.c#3 integrate .. //depot/projects/uart/ufs/ufs/ufs_quota.c#3 integrate .. //depot/projects/uart/ufs/ufs/ufs_vnops.c#5 integrate .. //depot/projects/uart/vm/device_pager.c#3 integrate .. //depot/projects/uart/vm/pmap.h#7 integrate .. //depot/projects/uart/vm/swap_pager.c#11 integrate .. //depot/projects/uart/vm/vm_contig.c#7 integrate .. //depot/projects/uart/vm/vm_extern.h#3 integrate .. //depot/projects/uart/vm/vm_fault.c#5 integrate .. //depot/projects/uart/vm/vm_glue.c#6 integrate .. //depot/projects/uart/vm/vm_kern.c#7 integrate .. //depot/projects/uart/vm/vm_map.c#11 integrate .. //depot/projects/uart/vm/vm_map.h#7 integrate .. //depot/projects/uart/vm/vm_mmap.c#7 integrate .. //depot/projects/uart/vm/vm_object.c#7 integrate .. //depot/projects/uart/vm/vm_page.c#8 integrate .. //depot/projects/uart/vm/vm_page.h#4 integrate .. //depot/projects/uart/vm/vm_pageout.c#9 integrate .. //depot/projects/uart/vm/vm_pageout.h#3 integrate .. //depot/projects/uart/vm/vnode_pager.c#7 integrate Differences ... ==== //depot/projects/uart/alpha/alpha/machdep.c#8 (text+ko) ==== @@ -88,7 +88,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.212 2003/08/25 03:43:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.213 2003/10/19 02:36:06 peter Exp $"); #include "opt_compat.h" #include "opt_ddb.h" @@ -1731,6 +1731,12 @@ prom_halt(1); } +void +cpu_idle(void) +{ + /* Insert code to halt (until next interrupt) for the idle loop */ +} + /* * Clear registers on exec */ ==== //depot/projects/uart/alpha/alpha/trap.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.116 2003/08/22 07:20:25 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.117 2003/10/09 10:17:15 robert Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" @@ -45,6 +45,7 @@ #include <sys/smp.h> #include <sys/vmmeter.h> #include <sys/sysent.h> +#include <sys/signalvar.h> #include <sys/syscall.h> #include <sys/pioctl.h> #include <vm/vm.h> @@ -729,6 +730,8 @@ STOPEVENT(p, S_SCE, (callp->sy_narg & SYF_ARGMASK)); + PTRACESTOP_SC(p, td, S_PT_SCE); + error = (*callp->sy_call)(td, args + hidden); } @@ -775,6 +778,8 @@ */ STOPEVENT(p, S_SCX, code); + PTRACESTOP_SC(p, td, S_PT_SCX); + #ifdef DIAGNOSTIC cred_free_thread(td); #endif ==== //depot/projects/uart/alpha/include/pmap.h#2 (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.23 2003/04/10 18:42:06 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.24 2003/10/06 01:47:11 bms Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -183,7 +183,6 @@ }; #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) -#define pmap_resident_count(pmap) (pmap)->pm_stats.resident_count #define PM_FLAG_LOCKED 0x1 #define PM_FLAG_WANTED 0x2 ==== //depot/projects/uart/amd64/amd64/exception.S#4 (text+ko) ==== @@ -31,7 +31,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.112 2003/09/22 22:54:14 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.113 2003/10/15 02:04:52 peter Exp $ */ #include <machine/asmacros.h> @@ -228,7 +228,7 @@ movq %rsp,PCPU(SCRATCH_RSP) movq common_tss+COMMON_TSS_RSP0,%rsp /* Now emulate a trapframe. Make the 8 byte alignment odd for call. */ - subq $TF_SIZE+8,%rsp + subq $TF_SIZE,%rsp /* defer TF_RSP till we have a spare register */ movq %r11,TF_RFLAGS(%rsp) movq %rcx,TF_RIP(%rsp) /* %rcx original value is in %r10 */ ==== //depot/projects/uart/amd64/amd64/machdep.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.593 2003/09/23 00:45:55 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.594 2003/10/18 22:25:07 njl Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -455,6 +455,17 @@ SYSCTL_INT(_machdep, OID_AUTO, cpu_idle_hlt, CTLFLAG_RW, &cpu_idle_hlt, 0, "Idle loop HLT enable"); +static void +cpu_idle_default(void) +{ + /* + * we must absolutely guarentee that hlt is the + * absolute next instruction after sti or we + * introduce a timing window. + */ + __asm __volatile("sti; hlt"); +} + /* * Note that we have to be careful here to avoid a race between checking * sched_runnable() and actually halting. If we don't do this, we may waste @@ -467,19 +478,16 @@ if (cpu_idle_hlt) { disable_intr(); - if (sched_runnable()) { + if (sched_runnable()) enable_intr(); - } else { - /* - * we must absolutely guarentee that hlt is the - * absolute next instruction after sti or we - * introduce a timing window. - */ - __asm __volatile("sti; hlt"); - } + else + (*cpu_idle_hook)(); } } +/* Other subsystems (e.g., ACPI) can hook this later. */ +void (*cpu_idle_hook)(void) = cpu_idle_default; + /* * Clear registers on exec */ ==== //depot/projects/uart/amd64/amd64/pmap.c#20 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.441 2003/10/03 22:46:52 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.443 2003/10/14 05:51:31 alc Exp $"); /* * Manages physical address maps. @@ -127,7 +127,6 @@ #include <vm/vm_pageout.h> #include <vm/vm_pager.h> #include <vm/uma.h> -#include <vm/uma_int.h> #include <machine/cpu.h> #include <machine/cputypes.h> @@ -529,52 +528,6 @@ return (void *)kmem_alloc(kernel_map, bytes); } -void * -uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) -{ - static vm_pindex_t colour; - vm_page_t m; - int pflags; - void *va; - - *flags = UMA_SLAB_PRIV; - - if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT) - pflags = VM_ALLOC_INTERRUPT; - else - pflags = VM_ALLOC_SYSTEM; - - if (wait & M_ZERO) - pflags |= VM_ALLOC_ZERO; - - for (;;) { - m = vm_page_alloc(NULL, colour++, pflags | VM_ALLOC_NOOBJ); - if (m == NULL) { - if (wait & M_NOWAIT) - return (NULL); - else - VM_WAIT; - } else - break; - } - - va = (void *)PHYS_TO_DMAP(m->phys_addr); - if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0) - pagezero(va); - return (va); -} - -void -uma_small_free(void *mem, int size, u_int8_t flags) -{ - vm_page_t m; - - m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)mem)); - vm_page_lock_queues(); - vm_page_free(m); - vm_page_unlock_queues(); -} - /* * Initialize the pmap module. * Called by vm_init, to initialize any structures that the pmap @@ -1022,7 +975,6 @@ VM_WAIT; vm_page_lock_queues(); vm_page_flag_clear(pml4pg, PG_BUSY); - pml4pg->valid = VM_PAGE_BITS_ALL; vm_page_unlock_queues(); pmap->pm_pml4 = (pml4_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(pml4pg)); @@ -1196,7 +1148,6 @@ } vm_page_lock_queues(); - m->valid = VM_PAGE_BITS_ALL; vm_page_flag_clear(m, PG_ZERO); vm_page_wakeup(m); vm_page_unlock_queues(); ==== //depot/projects/uart/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.264 2003/09/22 22:52:46 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.266 2003/10/15 02:04:52 peter Exp $"); /* * AMD64 Trap and System call handling @@ -55,6 +55,7 @@ #include <sys/systm.h> #include <sys/proc.h> #include <sys/pioctl.h> +#include <sys/ptrace.h> #include <sys/kernel.h> #include <sys/ktr.h> #include <sys/lock.h> @@ -257,6 +258,9 @@ default: ucode = code + BUS_SEGM_FAULT ; i = SIGBUS; +printf("trap %d: pid %d err %p eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", type, p->p_pid, (void *)frame.tf_err, +(void *)frame.tf_addr, (void *)frame.tf_rip, (void *)frame.tf_rax, (void *)frame.tf_rbx, (void *)frame.tf_rcx, (void *)frame.tf_rdx, (void *)frame.tf_rsp, (void *)frame.tf_rbp, (void *)frame.tf_rsi, (void *)frame.tf_rdi); + break; case T_PAGEFLT: /* page fault */ @@ -541,6 +545,12 @@ return (-1); } +printf("trap_pfault: pid %d %s %s %s eva %p, rip %p, rax %p, rbx %p, rcx %p, rdx %p, rsp %p, rbp %p, rsi %p, rdi %p\n", p->p_pid, + frame->tf_err & PGEX_U ? "user" : "supervisor", + frame->tf_err & PGEX_W ? "write" : "read", + frame->tf_err & PGEX_P ? "protection violation" : "page not present", +(void *)eva, (void *)frame->tf_rip, (void *)frame->tf_rax, (void *)frame->tf_rbx, (void *)frame->tf_rcx, (void *)frame->tf_rdx, (void *)frame->tf_rsp, (void *)frame->tf_rbp, (void *)frame->tf_rsi, (void *)frame->tf_rdi); + return((rv == KERN_PROTECTION_FAILURE) ? SIGBUS : SIGSEGV); } @@ -740,6 +750,8 @@ STOPEVENT(p, S_SCE, narg); + PTRACESTOP_SC(p, td, S_PT_SCE); + error = (*callp->sy_call)(td, argp); } @@ -808,6 +820,8 @@ */ STOPEVENT(p, S_SCX, code); + PTRACESTOP_SC(p, td, S_PT_SCX); + #ifdef DIAGNOSTIC cred_free_thread(td); #endif ==== //depot/projects/uart/amd64/include/frame.h#2 (text+ko) ==== @@ -34,7 +34,7 @@ * SUCH DAMAGE. * * from: @(#)frame.h 5.2 (Berkeley) 1/18/91 - * $FreeBSD: src/sys/amd64/include/frame.h,v 1.24 2003/05/12 18:33:19 peter Exp $ + * $FreeBSD: src/sys/amd64/include/frame.h,v 1.25 2003/10/15 02:04:52 peter Exp $ */ #ifndef _MACHINE_FRAME_H_ @@ -69,6 +69,7 @@ register_t tf_r15; register_t tf_trapno; register_t tf_addr; + register_t tf_flags; /* below portion defined in hardware */ register_t tf_err; register_t tf_rip; @@ -98,6 +99,7 @@ register_t if_r15; register_t :64; /* compat with trap frame - trapno */ register_t :64; /* compat with trap frame - addr */ + register_t :64; /* compat with trap frame - flags */ register_t :64; /* compat with trap frame - err */ /* below portion defined in hardware */ register_t if_rip; @@ -127,6 +129,7 @@ register_t cf_r15; register_t :64; /* compat with trap frame - trapno */ register_t :64; /* compat with trap frame - addr */ + register_t :64; /* compat with trap frame - flags */ register_t :64; /* compat with trap frame - err */ /* below portion defined in hardware */ register_t cf_rip; ==== //depot/projects/uart/amd64/include/pmap.h#4 (text+ko) ==== @@ -42,7 +42,7 @@ * * from: hp300: @(#)pmap.h 7.2 (Berkeley) 12/16/90 * from: @(#)pmap.h 7.4 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.106 2003/09/27 20:53:01 alc Exp $ + * $FreeBSD: src/sys/amd64/include/pmap.h,v 1.107 2003/10/06 01:47:11 bms Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -226,7 +226,6 @@ }; #define pmap_page_is_mapped(m) (!TAILQ_EMPTY(&(m)->md.pv_list)) -#define pmap_resident_count(pmap) (pmap)->pm_stats.resident_count typedef struct pmap *pmap_t; ==== //depot/projects/uart/amd64/include/signal.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)signal.h 8.1 (Berkeley) 6/11/93 - * $FreeBSD: src/sys/amd64/include/signal.h,v 1.23 2003/09/08 18:31:48 peter Exp $ + * $FreeBSD: src/sys/amd64/include/signal.h,v 1.24 2003/10/15 02:04:52 peter Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -91,6 +91,7 @@ long sc_r15; long sc_trapno; long sc_addr; + long sc_flags; long sc_err; long sc_rip; long sc_cs; @@ -104,9 +105,8 @@ */ long sc_fpformat; long sc_ownedfp; - long sc_spare1[1]; long sc_fpstate[64] __aligned(16); - long sc_spare2[8]; + long sc_spare[8]; }; #endif /* __BSD_VISIBLE */ ==== //depot/projects/uart/amd64/include/ucontext.h#4 (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/amd64/include/ucontext.h,v 1.15 2003/10/01 01:08:04 peter Exp $ + * $FreeBSD: src/sys/amd64/include/ucontext.h,v 1.16 2003/10/15 02:04:52 peter Exp $ */ #ifndef _MACHINE_UCONTEXT_H_ @@ -55,6 +55,7 @@ __register_t mc_r15; __register_t mc_trapno; __register_t mc_addr; + __register_t mc_flags; __register_t mc_err; __register_t mc_rip; __register_t mc_cs; @@ -70,12 +71,11 @@ #define _MC_FPOWNED_FPU 0x20001 /* FP state came from FPU */ #define _MC_FPOWNED_PCB 0x20002 /* FP state came from PCB */ long mc_ownedfp; - long mc_spare1[1]; /* align mc_fpstate to 16 bytes */ /* * See <machine/npx.h> for the internals of mc_fpstate[]. */ long mc_fpstate[64] __aligned(16); - long mc_spare2[8]; + long mc_spare[8]; } mcontext_t; #endif /* !_MACHINE_UCONTEXT_H_ */ ==== //depot/projects/uart/cam/cam_periph.c#4 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.53 2003/09/21 08:42:32 thomas Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/cam_periph.c,v 1.54 2003/10/18 11:01:11 phk Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -638,9 +638,6 @@ /* set the transfer length, we know it's < DFLTPHYS */ mapinfo->bp[i]->b_bufsize = lengths[i]; - /* set the flags */ - mapinfo->bp[i]->b_flags = B_PHYS; - /* set the direction */ mapinfo->bp[i]->b_iocmd = flags[i]; @@ -656,10 +653,8 @@ for (j = 0; j < i; ++j) { *data_ptrs[j] = mapinfo->bp[j]->b_saveaddr; vunmapbuf(mapinfo->bp[j]); - mapinfo->bp[j]->b_flags &= ~B_PHYS; relpbuf(mapinfo->bp[j], NULL); } - mapinfo->bp[i]->b_flags &= ~B_PHYS; relpbuf(mapinfo->bp[i], NULL); PRELE(curproc); return(EACCES); @@ -720,9 +715,6 @@ /* unmap the buffer */ vunmapbuf(mapinfo->bp[i]); - /* clear the flags we set above */ - mapinfo->bp[i]->b_flags &= ~B_PHYS; - /* release the buffer */ relpbuf(mapinfo->bp[i], NULL); } ==== //depot/projects/uart/cam/scsi/scsi_cd.c#6 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.84 2003/09/30 07:52:15 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_cd.c,v 1.87 2003/10/18 17:24:05 phk Exp $"); #include "opt_cd.h" @@ -92,17 +92,18 @@ } cd_quirks; typedef enum { - CD_FLAG_INVALID = 0x001, - CD_FLAG_NEW_DISC = 0x002, - CD_FLAG_DISC_LOCKED = 0x004, - CD_FLAG_DISC_REMOVABLE = 0x008, - CD_FLAG_TAGGED_QUEUING = 0x010, - CD_FLAG_CHANGER = 0x040, - CD_FLAG_ACTIVE = 0x080, - CD_FLAG_SCHED_ON_COMP = 0x100, - CD_FLAG_RETRY_UA = 0x200, - CD_FLAG_VALID_MEDIA = 0x400, - CD_FLAG_VALID_TOC = 0x800 + CD_FLAG_INVALID = 0x0001, + CD_FLAG_NEW_DISC = 0x0002, + CD_FLAG_DISC_LOCKED = 0x0004, + CD_FLAG_DISC_REMOVABLE = 0x0008, + CD_FLAG_TAGGED_QUEUING = 0x0010, + CD_FLAG_CHANGER = 0x0040, + CD_FLAG_ACTIVE = 0x0080, + CD_FLAG_SCHED_ON_COMP = 0x0100, + CD_FLAG_RETRY_UA = 0x0200, + CD_FLAG_VALID_MEDIA = 0x0400, + CD_FLAG_VALID_TOC = 0x0800, + CD_FLAG_SCTX_INIT = 0x1000 } cd_flags; typedef enum { @@ -421,7 +422,8 @@ xpt_print_path(periph->path); printf("removing device entry\n"); - if (sysctl_ctx_free(&softc->sysctl_ctx) != 0) { + if ((softc->flags & CD_FLAG_SCTX_INIT) != 0 + && sysctl_ctx_free(&softc->sysctl_ctx) != 0) { xpt_print_path(periph->path); printf("can't remove sysctl context\n"); } @@ -496,6 +498,7 @@ free(softc->changer, M_DEVBUF); num_changers--; } + disk_destroy(&softc->disk); free(softc, M_DEVBUF); splx(s); } @@ -580,6 +583,7 @@ mtx_lock(&Giant); sysctl_ctx_init(&softc->sysctl_ctx); + softc->flags |= CD_FLAG_SCTX_INIT; softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, SYSCTL_STATIC_CHILDREN(_kern_cam_cd), OID_AUTO, tmpstr2, CTLFLAG_RD, 0, tmpstr); @@ -1514,8 +1518,8 @@ /* read */bp->bio_cmd == BIO_READ, /* byte2 */ 0, /* minimum_cmd_size */ 10, - /* lba */ bp->bio_blkno / - (softc->params.blksize / DEV_BSIZE), + /* lba */ bp->bio_offset / + softc->params.blksize, bp->bio_bcount / softc->params.blksize, /* data_ptr */ bp->bio_data, /* dxfer_len */ bp->bio_bcount, @@ -2852,6 +2856,20 @@ ccb = cdgetccb(periph, /* priority */ 1); + scsi_test_unit_ready(&ccb->csio, 0, cddone, + MSG_SIMPLE_Q_TAG, SSD_FULL_SIZE, 1000); + ccb->ccb_h.ccb_bp = NULL; + + error = cam_periph_runccb(ccb, NULL, + /*cam_flags*/0, + /*sense_flags*/SF_RETRY_UA, + softc->disk.d_devstat); + + if ((ccb->ccb_h.status & CAM_STATUS_MASK) != CAM_REQ_CMP) { + xpt_release_ccb(ccb); + return (ENXIO); + } + rcap_buf = malloc(sizeof(struct scsi_read_capacity_data), M_TEMP, M_WAITOK); ==== //depot/projects/uart/cam/scsi/scsi_da.c#9 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.159 2003/09/04 01:01:20 njl Exp $"); +__FBSDID("$FreeBSD: src/sys/cam/scsi/scsi_da.c,v 1.160 2003/10/08 07:12:30 thomas Exp $"); #ifdef _KERNEL #include "opt_da.h" @@ -89,7 +89,8 @@ DA_FLAG_NEED_OTAG = 0x020, DA_FLAG_WENT_IDLE = 0x040, DA_FLAG_RETRY_UA = 0x080, - DA_FLAG_OPEN = 0x100 + DA_FLAG_OPEN = 0x100, + DA_FLAG_SCTX_INIT = 0x200 } da_flags; typedef enum { @@ -838,7 +839,8 @@ /* * If we can't free the sysctl tree, oh well... */ - if (sysctl_ctx_free(&softc->sysctl_ctx) != 0) { + if ((softc->flags & DA_FLAG_SCTX_INIT) != 0 + && sysctl_ctx_free(&softc->sysctl_ctx) != 0) { xpt_print_path(periph->path); printf("can't remove sysctl context\n"); } @@ -925,6 +927,7 @@ mtx_lock(&Giant); sysctl_ctx_init(&softc->sysctl_ctx); + softc->flags |= DA_FLAG_SCTX_INIT; softc->sysctl_tree = SYSCTL_ADD_NODE(&softc->sysctl_ctx, >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200310190455.h9J4tM5e092035>