Date: Mon, 8 Jul 2002 19:39:46 -0700 (PDT) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 13943 for review Message-ID: <200207090239.g692dkVw059256@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=13943 Change 13943 by jhb@jhb_laptop on 2002/07/08 19:39:31 IFC @13574 (pre-KSE3) This includes un-backing out cred_free_thread() changes. I guess jhbBSD will diverge that much more from FreeBSD. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#31 integrate .. //depot/projects/smpng/sys/alpha/alpha/support.s#5 integrate .. //depot/projects/smpng/sys/alpha/alpha/trap.c#34 integrate .. //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#11 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#19 integrate .. //depot/projects/smpng/sys/alpha/include/runq.h#2 integrate .. //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#16 integrate .. //depot/projects/smpng/sys/arm/include/types.h#3 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#3 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/boot1.c#2 integrate .. //depot/projects/smpng/sys/boot/alpha/boot1/sys.c#5 delete .. //depot/projects/smpng/sys/boot/alpha/libalpha/common.h#2 integrate .. //depot/projects/smpng/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/smpng/sys/boot/efi/libefi/bootinfo.c#4 integrate .. //depot/projects/smpng/sys/boot/i386/Makefile#4 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#6 integrate .. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#11 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/bootinfo.c#6 integrate .. //depot/projects/smpng/sys/boot/i386/loader/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/ia64/libski/bootinfo.c#3 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#8 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#6 integrate .. //depot/projects/smpng/sys/cam/cam_periph.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_sa.c#5 integrate .. //depot/projects/smpng/sys/compat/linux/linux_ioctl.c#15 integrate .. //depot/projects/smpng/sys/compat/linux/linux_misc.c#24 integrate .. //depot/projects/smpng/sys/compat/svr4/svr4_stream.c#8 integrate .. //depot/projects/smpng/sys/conf/NOTES#17 integrate .. //depot/projects/smpng/sys/conf/files#44 integrate .. //depot/projects/smpng/sys/conf/files.i386#25 integrate .. //depot/projects/smpng/sys/conf/files.pc98#25 integrate .. //depot/projects/smpng/sys/conf/files.sparc64#16 integrate .. //depot/projects/smpng/sys/conf/kern.pre.mk#12 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#11 integrate .. //depot/projects/smpng/sys/conf/options#30 integrate .. //depot/projects/smpng/sys/conf/options.i386#15 integrate .. //depot/projects/smpng/sys/conf/options.ia64#8 integrate .. //depot/projects/smpng/sys/conf/options.pc98#17 integrate .. //depot/projects/smpng/sys/contrib/dev/acpica/acpica_prep.sh#2 integrate .. //depot/projects/smpng/sys/ddb/db_elf.c#2 integrate .. //depot/projects/smpng/sys/ddb/db_examine.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_expr.c#3 integrate .. //depot/projects/smpng/sys/ddb/db_run.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#20 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#22 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#21 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#9 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#4 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#12 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#5 integrate .. //depot/projects/smpng/sys/dev/drm/drm_os_freebsd.h#4 integrate .. //depot/projects/smpng/sys/dev/em/if_em_fxhw.c#5 delete .. //depot/projects/smpng/sys/dev/em/if_em_fxhw.h#4 delete .. //depot/projects/smpng/sys/dev/em/if_em_phy.c#5 delete .. //depot/projects/smpng/sys/dev/em/if_em_phy.h#4 delete .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#15 integrate .. //depot/projects/smpng/sys/dev/hea/eni.c#5 integrate .. //depot/projects/smpng/sys/dev/hea/eni.h#4 integrate .. //depot/projects/smpng/sys/dev/hea/eni_globals.c#2 integrate .. //depot/projects/smpng/sys/dev/hea/eni_receive.c#3 integrate .. //depot/projects/smpng/sys/dev/hea/eni_transmit.c#3 integrate .. //depot/projects/smpng/sys/dev/hea/eni_var.h#3 integrate .. //depot/projects/smpng/sys/dev/hea/hea_freebsd.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_buffer.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_command.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_globals.c#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_if.c#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_include.h#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_init.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_load.c#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_output.c#4 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#3 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_stats.c#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_transmit.c#2 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_var.h#2 integrate .. //depot/projects/smpng/sys/dev/hfa/hfa_freebsd.c#3 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#20 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#13 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#12 integrate .. //depot/projects/smpng/sys/dev/isp/isp_inline.h#7 integrate .. //depot/projects/smpng/sys/dev/isp/isp_ioctl.h#6 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.c#5 integrate .. //depot/projects/smpng/sys/dev/isp/isp_target.h#6 integrate .. //depot/projects/smpng/sys/dev/isp/ispmbox.h#11 integrate .. //depot/projects/smpng/sys/dev/isp/ispvar.h#14 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#6 integrate .. //depot/projects/smpng/sys/dev/md/md.c#22 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#14 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#15 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#5 integrate .. //depot/projects/smpng/sys/dev/pci/pcivar.h#6 integrate .. //depot/projects/smpng/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/smpng/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#19 integrate .. //depot/projects/smpng/sys/dev/sio/sio_ebus.c#1 branch .. //depot/projects/smpng/sys/dev/sio/sioreg.h#3 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/uhub.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#15 integrate .. //depot/projects/smpng/sys/dev/usb/usb_subr.c#11 integrate .. //depot/projects/smpng/sys/dev/wi/if_wavelan_ieee.h#8 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#36 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi_pci.c#8 integrate .. //depot/projects/smpng/sys/dev/wi/if_wireg.h#14 integrate .. //depot/projects/smpng/sys/dev/wi/if_wivar.h#8 integrate .. //depot/projects/smpng/sys/dev/wi/wi_hostap.c#8 integrate .. //depot/projects/smpng/sys/dev/wi/wi_hostap.h#5 integrate .. //depot/projects/smpng/sys/fs/nullfs/null.h#3 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_subr.c#3 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#5 integrate .. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/smpng/sys/fs/udf/udf_mount.h#2 delete .. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#2 integrate .. //depot/projects/smpng/sys/fs/unionfs/union.h#5 integrate .. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#11 integrate .. //depot/projects/smpng/sys/geom/geom.h#9 integrate .. //depot/projects/smpng/sys/geom/geom_aes.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#10 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_disk.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#5 integrate .. //depot/projects/smpng/sys/geom/geom_slice.c#7 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#8 integrate .. //depot/projects/smpng/sys/geom/geom_sunlabel.c#8 integrate .. //depot/projects/smpng/sys/gnu/i386/fpemul/load_store.c#2 integrate .. //depot/projects/smpng/sys/gnu/i386/fpemul/reg_ld_str.c#2 integrate .. //depot/projects/smpng/sys/i386/Makefile#3 integrate .. //depot/projects/smpng/sys/i386/conf/Makefile#5 integrate .. //depot/projects/smpng/sys/i386/conf/OLDCARD#1 branch .. //depot/projects/smpng/sys/i386/i386/in_cksum.c#3 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/math_emulate.c#5 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#22 integrate .. //depot/projects/smpng/sys/i386/i386/support.s#6 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#39 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#11 integrate .. //depot/projects/smpng/sys/i386/i386/vm_machdep.c#21 integrate .. //depot/projects/smpng/sys/i386/include/in_cksum.h#4 integrate .. //depot/projects/smpng/sys/i386/include/runq.h#2 integrate .. //depot/projects/smpng/sys/i386/include/specialreg.h#2 integrate .. //depot/projects/smpng/sys/i386/include/types.h#4 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#17 integrate .. //depot/projects/smpng/sys/i386/isa/intr_machdep.h#10 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_card.c#2 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_lli.c#4 integrate .. //depot/projects/smpng/sys/i4b/capi/iavc/iavc_pci.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#6 integrate .. //depot/projects/smpng/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_isac.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#5 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#2 integrate .. //depot/projects/smpng/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/smpng/sys/ia64/ia32/imgact_ia32.c#3 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#31 integrate .. //depot/projects/smpng/sys/ia64/ia64/support.s#9 integrate .. //depot/projects/smpng/sys/ia64/ia64/trap.c#34 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#14 integrate .. //depot/projects/smpng/sys/ia64/include/runq.h#2 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_acl.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_cap.c#6 delete .. //depot/projects/smpng/sys/kern/kern_descrip.c#30 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#38 integrate .. //depot/projects/smpng/sys/kern/kern_exit.c#43 integrate .. //depot/projects/smpng/sys/kern/kern_fork.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_jail.c#20 integrate .. //depot/projects/smpng/sys/kern/kern_ktrace.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_linker.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_module.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_physio.c#3 integrate .. //depot/projects/smpng/sys/kern/kern_poll.c#5 integrate .. //depot/projects/smpng/sys/kern/kern_proc.c#32 integrate .. //depot/projects/smpng/sys/kern/kern_prot.c#64 integrate .. //depot/projects/smpng/sys/kern/kern_resource.c#25 integrate .. //depot/projects/smpng/sys/kern/kern_sig.c#41 integrate .. //depot/projects/smpng/sys/kern/kern_subr.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_switch.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#26 integrate .. //depot/projects/smpng/sys/kern/kern_sysctl.c#18 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#13 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#16 integrate .. //depot/projects/smpng/sys/kern/kern_xxx.c#8 integrate .. //depot/projects/smpng/sys/kern/md5c.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_disklabel.c#10 integrate .. //depot/projects/smpng/sys/kern/subr_diskslice.c#11 integrate .. //depot/projects/smpng/sys/kern/subr_kobj.c#2 integrate .. //depot/projects/smpng/sys/kern/subr_log.c#6 integrate .. //depot/projects/smpng/sys/kern/subr_mbuf.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_prf.c#16 integrate .. //depot/projects/smpng/sys/kern/subr_prof.c#14 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#35 integrate .. //depot/projects/smpng/sys/kern/sys_generic.c#15 integrate .. //depot/projects/smpng/sys/kern/sys_pipe.c#18 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#9 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#16 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#15 integrate .. //depot/projects/smpng/sys/kern/tty.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_cow.c#1 branch .. //depot/projects/smpng/sys/kern/uipc_jumbo.c#1 branch .. //depot/projects/smpng/sys/kern/uipc_socket.c#24 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#17 integrate .. //depot/projects/smpng/sys/kern/uipc_syscalls.c#21 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#21 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#23 integrate .. //depot/projects/smpng/sys/kern/vfs_cache.c#13 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#10 integrate .. //depot/projects/smpng/sys/kern/vfs_export.c#6 integrate .. //depot/projects/smpng/sys/kern/vfs_init.c#7 integrate .. //depot/projects/smpng/sys/kern/vfs_subr.c#27 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#39 integrate .. //depot/projects/smpng/sys/kern/vfs_vnops.c#26 integrate .. //depot/projects/smpng/sys/modules/ipfw/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/device/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sppp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ti/Makefile#3 integrate .. //depot/projects/smpng/sys/net/bpf.h#4 integrate .. //depot/projects/smpng/sys/net/bridge.c#11 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#17 integrate .. //depot/projects/smpng/sys/net/if_ieee80211.h#3 integrate .. //depot/projects/smpng/sys/net/if_media.c#3 integrate .. //depot/projects/smpng/sys/net/rtsock.c#20 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#6 integrate .. //depot/projects/smpng/sys/netatm/atm_device.c#4 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#5 integrate .. //depot/projects/smpng/sys/netatm/atm_if.h#5 integrate .. //depot/projects/smpng/sys/netatm/atm_subr.c#10 integrate .. //depot/projects/smpng/sys/netatm/atm_sys.h#4 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#8 integrate .. //depot/projects/smpng/sys/netatm/port.h#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_lower.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_lower.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_var.h#3 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_cache.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_timer.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/uniarp_vcm.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/uniip.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/uniip_var.h#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_if.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_msg.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_subr.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_util.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_var.h#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_vc_state.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_device.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#6 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#10 integrate .. //depot/projects/smpng/sys/netinet/accf_data.c#6 integrate .. //depot/projects/smpng/sys/netinet/accf_http.c#6 integrate .. //depot/projects/smpng/sys/netinet/if_ether.c#14 integrate .. //depot/projects/smpng/sys/netinet/in.c#13 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#26 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.h#11 integrate .. //depot/projects/smpng/sys/netinet/ip_divert.c#17 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.c#8 integrate .. //depot/projects/smpng/sys/netinet/ip_dummynet.h#6 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.c#15 integrate .. //depot/projects/smpng/sys/netinet/ip_fw.h#8 integrate .. //depot/projects/smpng/sys/netinet/ip_fw2.c#1 branch .. //depot/projects/smpng/sys/netinet/ip_input.c#21 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#14 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#24 integrate .. //depot/projects/smpng/sys/netinet/ip_var.h#5 integrate .. //depot/projects/smpng/sys/netinet/raw_ip.c#20 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#20 integrate .. //depot/projects/smpng/sys/netinet/tcp_output.c#9 integrate .. //depot/projects/smpng/sys/netinet/tcp_subr.c#21 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/smpng/sys/netinet/tcp_timer.c#6 integrate .. //depot/projects/smpng/sys/netinet/tcp_usrreq.c#13 integrate .. //depot/projects/smpng/sys/netinet/tcp_var.h#8 integrate .. //depot/projects/smpng/sys/netinet/udp_usrreq.c#22 integrate .. //depot/projects/smpng/sys/netinet/udp_var.h#4 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.c#16 integrate .. //depot/projects/smpng/sys/netinet6/in6_pcb.h#5 integrate .. //depot/projects/smpng/sys/netinet6/raw_ip6.c#13 integrate .. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#15 integrate .. //depot/projects/smpng/sys/netkey/keysock.c#10 integrate .. //depot/projects/smpng/sys/netns/spp_usrreq.c#4 integrate .. //depot/projects/smpng/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_bio.c#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_socket.c#11 integrate .. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#21 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#35 integrate .. //depot/projects/smpng/sys/pc98/pc98/clock.c#10 integrate .. //depot/projects/smpng/sys/pc98/pc98/fd.c#12 integrate .. //depot/projects/smpng/sys/pc98/pc98/sio.c#20 integrate .. //depot/projects/smpng/sys/pccard/i82365.h#6 integrate .. //depot/projects/smpng/sys/pccard/pccard.c#13 integrate .. //depot/projects/smpng/sys/pccard/pcic.c#15 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.c#21 integrate .. //depot/projects/smpng/sys/pccard/pcic_pci.h#9 integrate .. //depot/projects/smpng/sys/pccard/plxcard.c#2 delete .. //depot/projects/smpng/sys/pccard/plxcardreg.h#2 delete .. //depot/projects/smpng/sys/pci/if_sk.c#8 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#12 integrate .. //depot/projects/smpng/sys/pci/if_tireg.h#2 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#6 integrate .. //depot/projects/smpng/sys/pci/ti_fw.h#2 integrate .. //depot/projects/smpng/sys/pci/ti_fw2.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/runq.h#2 integrate .. //depot/projects/smpng/sys/powerpc/include/types.h#3 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/copyinout.c#5 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#23 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/vm_machdep.c#14 integrate .. //depot/projects/smpng/sys/sparc64/conf/GENERIC#15 integrate .. //depot/projects/smpng/sys/sparc64/include/clock.h#4 integrate .. //depot/projects/smpng/sys/sparc64/include/fp.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#13 integrate .. //depot/projects/smpng/sys/sparc64/include/profile.h#2 integrate .. //depot/projects/smpng/sys/sparc64/include/runq.h#2 integrate .. //depot/projects/smpng/sys/sparc64/include/smp.h#8 integrate .. //depot/projects/smpng/sys/sparc64/include/tlb.h#12 integrate .. //depot/projects/smpng/sys/sparc64/include/vmparam.h#9 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#4 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#3 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#7 integrate .. //depot/projects/smpng/sys/sparc64/pci/psychoreg.h#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/bus_machdep.c#6 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/critical.c#3 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/elf_machdep.c#5 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#30 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_exception.s#4 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/mp_machdep.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#24 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/support.s#13 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/trap.c#36 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/vm_machdep.c#21 integrate .. //depot/projects/smpng/sys/sys/_lock.h#10 integrate .. //depot/projects/smpng/sys/sys/_mutex.h#8 integrate .. //depot/projects/smpng/sys/sys/_sigset.h#1 branch .. //depot/projects/smpng/sys/sys/_types.h#3 integrate .. //depot/projects/smpng/sys/sys/capability.h#6 delete .. //depot/projects/smpng/sys/sys/disklabel.h#17 integrate .. //depot/projects/smpng/sys/sys/event.h#8 integrate .. //depot/projects/smpng/sys/sys/file.h#10 integrate .. //depot/projects/smpng/sys/sys/jumbo.h#1 branch .. //depot/projects/smpng/sys/sys/kobj.h#2 integrate .. //depot/projects/smpng/sys/sys/ktr.h#9 integrate .. //depot/projects/smpng/sys/sys/malloc.h#10 integrate .. //depot/projects/smpng/sys/sys/mbuf.h#9 integrate .. //depot/projects/smpng/sys/sys/md5.h#3 integrate .. //depot/projects/smpng/sys/sys/mount.h#13 integrate .. //depot/projects/smpng/sys/sys/proc.h#52 integrate .. //depot/projects/smpng/sys/sys/resource.h#6 integrate .. //depot/projects/smpng/sys/sys/select.h#2 integrate .. //depot/projects/smpng/sys/sys/signal.h#6 integrate .. //depot/projects/smpng/sys/sys/snoop.h#4 integrate .. //depot/projects/smpng/sys/sys/socket.h#7 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#22 integrate .. //depot/projects/smpng/sys/sys/stat.h#5 integrate .. //depot/projects/smpng/sys/sys/statvfs.h#1 branch .. //depot/projects/smpng/sys/sys/syscall.h#16 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#16 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#18 integrate .. //depot/projects/smpng/sys/sys/systm.h#31 integrate .. //depot/projects/smpng/sys/sys/tiio.h#1 branch .. //depot/projects/smpng/sys/sys/time.h#9 integrate .. //depot/projects/smpng/sys/sys/tree.h#1 branch .. //depot/projects/smpng/sys/sys/types.h#15 integrate .. //depot/projects/smpng/sys/sys/ucred.h#16 integrate .. //depot/projects/smpng/sys/sys/uio.h#7 integrate .. //depot/projects/smpng/sys/sys/un.h#7 integrate .. //depot/projects/smpng/sys/sys/vnode.h#19 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_alloc.c#12 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_balloc.c#5 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_inode.c#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#13 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#14 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep_stub.c#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_subr.c#4 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_tables.c#3 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#27 integrate .. //depot/projects/smpng/sys/ufs/ffs/ffs_vnops.c#6 integrate .. //depot/projects/smpng/sys/ufs/ffs/fs.h#7 integrate .. //depot/projects/smpng/sys/ufs/ffs/softdep.h#3 integrate .. //depot/projects/smpng/sys/ufs/ufs/dinode.h#4 integrate .. //depot/projects/smpng/sys/ufs/ufs/inode.h#4 integrate .. //depot/projects/smpng/sys/ufs/ufs/quota.h#4 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_acl.c#10 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_bmap.c#5 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extern.h#7 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_inode.c#7 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_lookup.c#10 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_quota.c#13 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_readwrite.c#10 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_vnops.c#16 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufsmount.h#6 integrate .. //depot/projects/smpng/sys/vm/device_pager.c#6 integrate .. //depot/projects/smpng/sys/vm/phys_pager.c#5 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#15 integrate .. //depot/projects/smpng/sys/vm/uma.h#5 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#16 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#9 integrate .. //depot/projects/smpng/sys/vm/vm_contig.c#6 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#12 integrate .. //depot/projects/smpng/sys/vm/vm_glue.c#13 integrate .. //depot/projects/smpng/sys/vm/vm_kern.c#6 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_map.h#11 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#20 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#14 integrate .. //depot/projects/smpng/sys/vm/vm_object.h#7 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#9 integrate .. //depot/projects/smpng/sys/vm/vm_pager.c#8 integrate .. //depot/projects/smpng/sys/vm/vm_unix.c#5 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#15 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#31 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.92 2002/04/29 07:43:08 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.93 2002/06/27 04:08:45 jeff Exp $ */ /* @@ -610,7 +610,7 @@ if (initial_pvs < MINPV) initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, - NULL, NULL, UMA_ALIGN_PTR, 0); + NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); uma_zone_set_allocf(pvzone, pmap_allocf); uma_prealloc(pvzone, initial_pvs); /* ==== //depot/projects/smpng/sys/alpha/alpha/support.s#5 (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/support.s,v 1.10 2002/05/26 16:03:12 dfr Exp $ + * $FreeBSD: src/sys/alpha/alpha/support.s,v 1.12 2002/06/20 07:40:53 peter Exp $ */ /* @@ -150,11 +150,6 @@ RET END(fubyte) - LEAF(suibyte, 2) - ldiq v0, -1 - RET - END(suibyte) - LEAF(fusufault, 0) ldq t0, PC_CURTHREAD(pcpup) ldq t0, TD_PCB(t0) @@ -164,8 +159,8 @@ END(fusufault) LEAF(fswintrberr, 0) -XLEAF(fuswintr, 2) /* XXX what is a 'word'? */ -XLEAF(suswintr, 2) /* XXX what is a 'word'? */ +XLEAF(fuswintr, 2) /* XXX 16 bit short for profiling */ +XLEAF(suswintr, 2) /* XXX 16 bit short for profiling */ LDGP(pv) ldiq v0, -1 RET ==== //depot/projects/smpng/sys/alpha/alpha/trap.c#34 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.94 2002/06/07 05:47:34 jhb Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.95 2002/06/24 06:21:52 mini Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* ==== //depot/projects/smpng/sys/alpha/alpha/vm_machdep.c#11 (text+ko) ==== @@ -38,7 +38,7 @@ * * from: @(#)vm_machdep.c 7.3 (Berkeley) 5/13/91 * Utah $Hdr: vm_machdep.c 1.16.1.1 89/06/23$ - * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.66 2002/04/05 00:52:15 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.67 2002/06/24 15:48:00 jake Exp $ */ /* * Copyright (c) 1994, 1995, 1996 Carnegie-Mellon University. @@ -248,6 +248,12 @@ } void +cpu_sched_exit(td) + register struct thread *td; +{ +} + +void cpu_wait(p) struct proc *p; { ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#19 (text+ko) ==== @@ -19,7 +19,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.138 2002/05/03 17:59:21 jmallett Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.140 2002/06/16 06:48:42 mjacob Exp $ machine alpha cpu EV4 @@ -130,7 +130,7 @@ # real time clock device mcclock -# Serial (COM) ports +# Serial (COM) ports (required) device sio # 8250, 16[45]50 based serial ports # Parallel port ==== //depot/projects/smpng/sys/alpha/include/runq.h#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/alpha/include/runq.h,v 1.1 2002/05/25 01:12:15 jake Exp $ + * $FreeBSD: src/sys/alpha/include/runq.h,v 1.2 2002/06/20 06:21:19 peter Exp $ */ #ifndef _MACHINE_RUNQ_H_ @@ -36,7 +36,7 @@ #define RQB_BIT(pri) (1UL << ((pri) & (RQB_BPW - 1))) #define RQB_WORD(pri) ((pri) >> RQB_L2BPW) -#define RQB_FFS(word) (ffs64(word)) +#define RQB_FFS(word) (ffs64(word) - 1) /* * Type of run queue status word. ==== //depot/projects/smpng/sys/alpha/osf1/osf1_misc.c#16 (text+ko) ==== @@ -29,7 +29,7 @@ /* * Additional Copyright (c) 1999 by Andrew Gallatin - * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.30 2002/04/13 23:11:22 jhb Exp $ + * $FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.31 2002/06/19 06:39:25 alfred Exp $ */ @@ -1056,17 +1056,20 @@ struct proc *p; int error; uid_t uid; + struct uidinfo *uip; struct ucred *newcred, *oldcred; p = td->td_proc; uid = SCARG(uap, uid); newcred = crget(); + uip = uifind(uid); PROC_LOCK(p); oldcred = p->p_ucred; if ((error = suser_cred(p->p_ucred, PRISON_ROOT)) != 0 && uid != oldcred->cr_ruid && uid != oldcred->cr_svuid) { PROC_UNLOCK(p); + uifree(uip); crfree(newcred); return (error); } @@ -1074,7 +1077,7 @@ crcopy(newcred, oldcred); if (error == 0) { if (uid != oldcred->cr_ruid) { - change_ruid(newcred, uid); + change_ruid(newcred, uip); setsugid(p); } if (oldcred->cr_svuid != uid) { @@ -1083,11 +1086,12 @@ } } if (newcred->cr_uid != uid) { - change_euid(newcred, uid); + change_euid(newcred, uip); setsugid(p); } p->p_ucred = newcred; PROC_UNLOCK(p); + uifree(uip); crfree(oldcred); return (0); } ==== //depot/projects/smpng/sys/arm/include/types.h#3 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)types.h 8.3 (Berkeley) 1/5/94 - * $FreeBSD: src/sys/arm/include/types.h,v 1.2 2002/03/20 18:22:19 alfred Exp $ + * $FreeBSD: src/sys/arm/include/types.h,v 1.3 2002/06/23 21:57:17 iedowse Exp $ */ #ifndef _MACHINE_TYPES_H_ @@ -49,7 +49,7 @@ typedef unsigned int vm_offset_t; typedef __int64_t vm_ooffset_t; -typedef unsigned int vm_pindex_t; +typedef __uint64_t vm_pindex_t; typedef unsigned int vm_size_t; typedef __int32_t register_t; ==== //depot/projects/smpng/sys/boot/alpha/boot1/Makefile#3 (text+ko) ==== @@ -1,5 +1,5 @@ # $NetBSD: Makefile,v 1.15 1998/03/28 00:21:35 thorpej Exp $ -# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.12 2002/05/10 09:26:27 obrien Exp $ +# $FreeBSD: src/sys/boot/alpha/boot1/Makefile,v 1.13 2002/06/11 06:56:31 phk Exp $ .include <../Makefile.inc> @@ -7,7 +7,7 @@ .PATH: ${.CURDIR}/../libalpha -SRCS= start.S boot1.c sys.c +SRCS= start.S boot1.c CFLAGS+= -ffreestanding -mno-fp-regs CFLAGS+= -DSECONDARY_LOAD_ADDRESS=${SECONDARY_LOAD_ADDRESS} -DMINIMAL CFLAGS+= -DBOOT1 ==== //depot/projects/smpng/sys/boot/alpha/boot1/boot1.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ /* - * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.9 2000/10/25 23:24:43 dfr Exp $ + * $FreeBSD: src/sys/boot/alpha/boot1/boot1.c,v 1.12 2002/06/29 02:32:32 peter Exp $ * From $NetBSD: bootxx.c,v 1.4 1997/09/06 14:08:29 drochner Exp $ */ @@ -32,18 +32,42 @@ #include <string.h> #include <sys/param.h> +#include <sys/dirent.h> +#include <sys/disklabel.h> #include <machine/prom.h> #include <machine/rpb.h> #define DEBUGxx +void puts(const char *s); +void puthex(u_long v); +static int dskread(void *, u_int64_t, size_t); + +#define printf(...) \ +while (0) + +#define memcpy(dst, src, len) \ +bcopy(src, dst, len) + +#include "ufsread.c" + extern end[]; int errno; char *heap = (char*) end; void +bcopy(const void *src, void *dst, size_t len) +{ + const char *s; + char *d; + + for (d = dst, s = src; len; len--) + *d++ = *s++; +} + +void putchar(int c) { if (c == '\n') @@ -70,21 +94,7 @@ putchar(*s++); } -void * -malloc(size_t size) -{ - char *p = heap; - size = (size + 7) & ~7; - heap += size; - return p; -} - void -free(void * p) -{ -} - -void panic(const char *message, ...) { puts(message); @@ -124,6 +134,7 @@ int digit; char hex[] = "0123456789abcdef"; + puts("0x"); if (!v) { puts("0"); return; @@ -138,11 +149,11 @@ #endif -void -devread(char *buf, int block, size_t size) +int +dskread(void *buf, u_int64_t block, size_t size) { #ifdef DEBUG - puts("devread("); + puts("dskread("); puthex((u_long)buf); puts(","); puthex(block); @@ -151,7 +162,8 @@ puts(")\n"); #endif - prom_read(prom_fd, size, buf, block); + prom_read(prom_fd, size * DEV_BSIZE, buf, block); + return (0); } static inline void @@ -189,17 +201,22 @@ return; } +static struct dmadat __dmadat; + static inline void loadfile(char *name, char *addr) { int n; char *p; + ino_t ino; puts("Loading "); puts(name); puts("\n"); - if (openrd(name)) { + dmadat = &__dmadat; + + if (devopen() || (ino = lookup(name)) == 0) { puts("Can't open file "); puts(name); puts("\n"); @@ -208,10 +225,16 @@ p = addr; do { - n = readit(p, 1024); + n = fsread(ino, p, VBLKSIZE); + if (n < 0) { + puts("Can't read file "); + puts(name); + puts("\n"); + halt(); + } p += n; twiddle(); - } while (n > 0); + } while (n == VBLKSIZE); devclose(); } @@ -230,7 +253,7 @@ char *name = "/boot/loader"; char *p; char filename[512]; - void (*entry) __P((void)); + void (*entry)(void); u_long start, freq; int i; ==== //depot/projects/smpng/sys/boot/alpha/libalpha/common.h#2 (text+ko) ==== @@ -1,11 +1,11 @@ /* - * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.2 1999/08/28 00:39:26 peter Exp $ + * $FreeBSD: src/sys/boot/alpha/libalpha/common.h,v 1.3 2002/06/29 02:32:32 peter Exp $ * From: $NetBSD: common.h,v 1.2 1998/01/05 07:02:48 perry Exp $ */ -int prom_open __P((char*, int)); -void OSFpal __P((void)); -void halt __P((void)); -u_int64_t prom_dispatch __P((int, ...)); -int cpu_number __P((void)); -void switch_palcode __P((void)); +int prom_open(char*, int); +void OSFpal(void); +void halt(void); +u_int64_t prom_dispatch(int, ...); +int cpu_number(void); +void switch_palcode(void); ==== //depot/projects/smpng/sys/boot/common/ufsread.c#2 (text+ko) ==== @@ -1,4 +1,13 @@ /* + * Copyright (c) 2002 Networks Associates Technology, Inc. + * All rights reserved. + * + * This software was developed for the FreeBSD Project by Marshall + * Kirk McKusick and Network Associates Laboratories, the Security + * Research Division of Network Associates, Inc. under DARPA/SPAWAR + * contract N66001-01-C-8035 ("CBOSS"), as part of the DARPA CHATS + * research program + * * Copyright (c) 1998 Robert Nordier * All rights reserved. * @@ -14,34 +23,36 @@ */ /* - * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.3 2002/06/05 12:00:49 phk Exp $ + * $FreeBSD: src/sys/boot/common/ufsread.c,v 1.5 2002/06/21 22:33:56 jake Exp $ */ +#include <ufs/ufs/dinode.h> #include <ufs/ffs/fs.h> -#include <ufs/ufs/dinode.h> /* * We use 4k `virtual' blocks for filesystem data, whatever the actual * filesystem block size. FFS blocks are always a multiple of 4k. */ #define VBLKSIZE 4096 +#define VBLKSHIFT 12 #define VBLKMASK (VBLKSIZE - 1) #define DBPERVBLK (VBLKSIZE / DEV_BSIZE) -#define IPERVBLK (VBLKSIZE / sizeof(struct dinode)) -#define INDIRPERVBLK (VBLKSIZE / sizeof(ufs_daddr_t)) -#define INO_TO_VBA(fs, x) (fsbtodb(fs, ino_to_fsba(fs, x)) + \ - (ino_to_fsbo(fs, x) / IPERVBLK) * DBPERVBLK) -#define INO_TO_VBO(fs, x) (ino_to_fsbo(fs, x) % IPERVBLK) +#define INDIRPERVBLK(fs) (NINDIR(fs) / ((fs)->fs_bsize / VBLKSIZE)) +#define IPERVBLK(fs) (INOPB(fs) / ((fs)->fs_bsize / VBLKSIZE)) +#define INO_TO_VBA(fs, ipervblk, x) \ + (fsbtodb(fs, cgimin(fs, ino_to_cg(fs, x))) + \ + (((x) % (fs)->fs_ipg) / (ipervblk) * DBPERVBLK)) +#define INO_TO_VBO(ipervblk, x) ((x) % ipervblk) #define FS_TO_VBA(fs, fsb, off) (fsbtodb(fs, fsb) + \ ((off) / VBLKSIZE) * DBPERVBLK) #define FS_TO_VBO(fs, fsb, off) ((off) & VBLKMASK) /* Buffers that must not span a 64k boundary. */ struct dmadat { - char blkbuf[VBLKSIZE]; /* filesystem blocks */ - ufs_daddr_t indbuf[VBLKSIZE / sizeof(ufs_daddr_t)]; /* indir blocks */ - char sbbuf[SBSIZE]; /* superblock */ - char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ + char blkbuf[VBLKSIZE]; /* filesystem blocks */ + char indbuf[VBLKSIZE]; /* indir blocks */ + char sbbuf[SBLOCKSIZE]; /* superblock */ + char secbuf[DEV_BSIZE]; /* for MBR/disklabel */ }; static struct dmadat *dmadat; @@ -61,16 +72,16 @@ fs_off = 0; while ((n = fsread(*ino, buf, DEV_BSIZE)) > 0) - for (s = buf; s < buf + DEV_BSIZE;) { - d = (void *)s; - if (ls) - printf("%s ", d->d_name); - else if (!strcmp(name, d->d_name)) { - *ino = d->d_fileno; - return d->d_type; + for (s = buf; s < buf + DEV_BSIZE;) { + d = (void *)s; + if (ls) + printf("%s ", d->d_name); + else if (!strcmp(name, d->d_name)) { + *ino = d->d_fileno; + return d->d_type; + } + s += d->d_reclen; } - s += d->d_reclen; - } if (n != -1 && ls) printf("\n"); return 0; @@ -95,8 +106,8 @@ if (!*path) break; for (s = path; *s && *s != '/'; s++); - if ((n = s - path) > MAXNAMLEN) - return 0; + if ((n = s - path) > MAXNAMLEN) + return 0; ls = *path == '?' && n == 1 && !*s; memcpy(name, path, n); name[n] = 0; @@ -111,28 +122,134 @@ return dt == DT_REG ? ino : 0; } +#ifndef __sparc64__ +#define UFS1_ONLY +#endif +#ifdef UFS1_ONLY + static ssize_t fsread(ino_t inode, void *buf, size_t nbyte) { - static struct dinode din; + static struct ufs1_dinode dp1; static ino_t inomap; - static daddr_t blkmap, indmap; char *blkbuf; - ufs_daddr_t *indbuf; + caddr_t indbuf; struct fs *fs; char *s; - ufs_daddr_t lbn, addr; - daddr_t vbaddr; - size_t n, nb, off, vboff; + size_t n, nb, size, off, vboff; + long lbn; + ufs1_daddr_t addr, vbaddr; + static ufs1_daddr_t blkmap, indmap; blkbuf = dmadat->blkbuf; indbuf = dmadat->indbuf; fs = (struct fs *)dmadat->sbbuf; if (!dsk_meta) { inomap = 0; - if (dskread(fs, SBOFF / DEV_BSIZE, SBSIZE / DEV_BSIZE)) + if (dskread(fs, SBLOCK_UFS1 / DEV_BSIZE, SBLOCKSIZE / DEV_BSIZE)) + return -1; + if (fs->fs_magic != FS_UFS1_MAGIC) { + printf("Not ufs\n"); + return -1; + } >>> 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?200207090239.g692dkVw059256>