Date: Tue, 30 Apr 2002 17:02:34 -0700 (PDT) From: "Andrew R. Reiter" <arr@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 10549 for review Message-ID: <200205010002.g4102YM05161@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=10549 Change 10549 by arr@arr_shibby on 2002/04/30 17:02:01 - Integ from TrustedBSD Base. Affected files ... ... //depot/projects/trustedbsd/audit/sys/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/pmap.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/alpha/trap.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/include/pmap.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/alpha/isa/isa_dma.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/boot/forth/loader.conf#4 integrate ... //depot/projects/trustedbsd/audit/sys/boot/pc98/kgzldr/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/pc98/loader/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/boot1.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/cam/cam_xpt.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/cam/scsi/scsi_all.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/NOTES#2 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files#9 integrate ... //depot/projects/trustedbsd/audit/sys/conf/files.ia64#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kern.post.mk#3 integrate ... //depot/projects/trustedbsd/audit/sys/conf/kmod.mk#4 integrate ... //depot/projects/trustedbsd/audit/sys/conf/options#5 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/IPFILTER.LICENCE#2 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/QNX_OCL.txt#1 branch ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/fil.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_compat.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_fil.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_fil.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_frag.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_ftp_pxy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_nat.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_proxy.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_state.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ip_state.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/contrib/ipfilter/netinet/ipl.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_cam.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_cam.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_disk.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aac_pci.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aacreg.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aac/aacvar.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/acpica/acpi_timer.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/ahc_eisa.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/ahc_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7770.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx.reg#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx.seq#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_93cx6.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_93cx6.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_freebsd.c#2 delete ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_freebsd.h#2 delete ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_inline.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_osm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aic7xxx_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/Makefile#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_gram.y#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_insformat.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_macro_gram.y#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_macro_scan.l#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_scan.l#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_symbol.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/aic7xxx/aicasm/aicasm_symbol.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ata/ata-dma.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/dev/bge/if_bge.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ciss/ciss.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drmP.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_agpsupport.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_auth.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_bufs.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_context.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_dma.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_drawable.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_fops.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_init.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_ioctl.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_linux.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_lists.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_lock.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_memory.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_os_freebsd.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_scatter.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_sysctl.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/drm_vm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/gamma.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/gamma_dma.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/gamma_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/gamma_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/i810_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_dma.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_state.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_ucode.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/mga_warp.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_cce.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/r128_state.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_cp.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_drv.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/radeon_state.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/sis_drm.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/tdfx.h#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/drm/tdfx_drv.c#1 branch ... //depot/projects/trustedbsd/audit/sys/dev/em/if_em.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gem/if_gem.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/gx/if_gx.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/hme/if_hme.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iir/iir.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iir/iir_ctrl.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/iir/iir_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/isp/isp_freebsd.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/lge/if_lge.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/acphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/amphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/brgphy.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/dcphy.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/e1000phy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/exphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/inphy.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/lxtphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mii.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mii.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mii_physubr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/miivar.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/mlphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/nsgphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/nsgphyreg.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/nsphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/pnaphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/pnphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/qsphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/rlphy.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/tdkphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/tlphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/ukphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/ukphy_subr.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/mii/xmphy.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/my/if_my.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/nge/if_nge.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/pccbb/pccbb.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/dev/ppbus/pps.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/puc/puc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/puc/pucdata.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sio/sio.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pci/es137x.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/ac97.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/ac97.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sound/pcm/sound.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/sym/sym_hipd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/dev/tx/if_tx.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/ohci.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/uhci.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usb_subr.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/usb/usbdevs_data.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/dev/vinum/vinumio.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi_pccard.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wi_pci.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/if_wivar.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/wi_hostap.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/dev/wi/wi_hostap.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/devfs/devfs.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/fs/devfs/devfs_vnops.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/fs/fifofs/fifo_vnops.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/fs/procfs/procfs_mem.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_io.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/fs/smbfs/smbfs_vfsops.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_bsd.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_dev.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_dump.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_enc.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_slice.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_slice.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/geom/geom_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/conf/GENERIC#5 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/autoconf.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/identcpu.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/mp_clock.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/pmap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/i386/trap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i386/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/bs/bsif.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/clock.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/i386/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/pci/pci_bus.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/i386/pci/pci_cfgreg.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/conf/SKI#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/elf_machdep.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/machdep.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/mca.c#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/pmap.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/sal.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/sscdisk.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/ia64/swtch.s#4 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/mca.h#1 branch ... //depot/projects/trustedbsd/audit/sys/ia64/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/include/sal.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/ia64/isa/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_clock.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_condvar.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_conf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_descrip.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_environment.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_exit.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_linker.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_malloc.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_ntptime.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_proc.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_sig.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_tc.c#7 integrate ... //depot/projects/trustedbsd/audit/sys/kern/kern_time.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/link_elf.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/makesyscalls.sh#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_bus.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_disklabel.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_hints.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_mchain.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_prf.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/subr_witness.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_socket.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_socket2.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/kern/uipc_usrreq.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_default.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/kern/vfs_syscalls.c#8 integrate ... //depot/projects/trustedbsd/audit/sys/modules/Makefile#6 integrate ... //depot/projects/trustedbsd/audit/sys/modules/aac/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/modules/drm/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/gamma/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/mga/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/r128/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/radeon/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/drm/tdfx/Makefile#1 branch ... //depot/projects/trustedbsd/audit/sys/modules/udf/Makefile#2 integrate ... //depot/projects/trustedbsd/audit/sys/net/if_media.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/net/raw_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/net/rtsock.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/netatalk/ddp_input.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_aal5.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_cm.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_subr.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/netatm/atm_var.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/netgraph/ng_socket.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/accf_data.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/accf_http.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/in.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_divert.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/ip_mroute.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/raw_ip.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/tcp_input.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet/udp_usrreq.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/icmp6.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/ip6_mroute.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/nd6.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/raw_ip6.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netinet6/udp6_usrreq.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/netipx/ipx_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netipx/spx_usrreq.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netkey/keysock.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netnatm/natm.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_iod.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_rq.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_subr.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/netsmb/smb_trantcp.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/bootp_subr.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/nfs_node.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/nfs_vfsops.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/nfsclient/nfsnode.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/nfsserver/nfs_serv.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/conf/GENERIC#4 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/clock.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/isa_dma.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/sio.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/pc98/pc98/syscons.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_dc.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_de.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_sk.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/pci/if_ti.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/pci/xrpu.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/frame.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/pcpu.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/include/spr.h#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/copyinout.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/genassym.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/locore.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/pmap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/sigcode.S#1 branch ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/swtch.s#3 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/trap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/powerpc/powerpc/trap_subr.S#1 branch ... //depot/projects/trustedbsd/audit/sys/sparc64/include/pmap.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/proc.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/include/sysarch.h#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/elf_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/machdep.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/pmap.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/sys_machdep.c#2 integrate ... //depot/projects/trustedbsd/audit/sys/sparc64/sparc64/vm_machdep.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/endian.h#1 branch ... //depot/projects/trustedbsd/audit/sys/sys/filedesc.h#7 integrate ... //depot/projects/trustedbsd/audit/sys/sys/linker.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sys/param.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/proc.h#6 integrate ... //depot/projects/trustedbsd/audit/sys/sys/signalvar.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/sys/socketvar.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/time.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/timepps.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sys/timetc.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/sys/timex.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/sys/vnode.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/vm/pmap.h#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/uma.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/uma_core.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/uma_int.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_fault.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_glue.c#6 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_kern.c#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_map.c#5 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_map.h#5 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_page.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_page.h#3 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vm_pageout.c#4 integrate ... //depot/projects/trustedbsd/audit/sys/vm/vnode_pager.c#3 integrate Differences ... ==== //depot/projects/trustedbsd/audit/sys/Makefile#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.25 2000/08/24 18:53:09 peter Exp $ +# $FreeBSD: src/sys/Makefile,v 1.26 2002/04/26 17:55:21 ru Exp $ # The boot loader SUBDIR= boot @@ -8,11 +8,6 @@ SUBDIR+=modules .endif -afterdistribute: - ${INSTALL} ${COPY} -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${MACHINE}/conf/GENERIC.hints \ - ${DESTDIR}/boot/device.hints - HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh` .include <bsd.subdir.mk> ==== //depot/projects/trustedbsd/audit/sys/alpha/alpha/elf_machdep.c#3 (text+ko) ==== @@ -22,7 +22,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/alpha/elf_machdep.c,v 1.8 2002/02/21 23:34:09 gallatin Exp $ + * $FreeBSD: src/sys/alpha/alpha/elf_machdep.c,v 1.9 2002/04/25 01:22:15 marcel Exp $ */ #include <sys/param.h> @@ -38,13 +38,13 @@ /* Process one elf relocation with addend. */ int -elf_reloc(linker_file_t lf, const void *data, int type, const char *sym) +elf_reloc(linker_file_t lf, const void *data, int type) { Elf_Addr relocbase = (Elf_Addr) lf->address; Elf_Addr *where; Elf_Addr addr; Elf_Addr addend; - Elf_Word rtype; + Elf_Word rtype, symidx; const Elf_Rel *rel; const Elf_Rela *rela; @@ -54,12 +54,14 @@ where = (Elf_Addr *) (relocbase + rel->r_offset); addend = *where; rtype = ELF_R_TYPE(rel->r_info); + symidx = ELF_R_SYM(rel->r_info); break; case ELF_RELOC_RELA: rela = (const Elf_Rela *)data; where = (Elf_Addr *) (relocbase + rela->r_offset); addend = rela->r_addend; rtype = ELF_R_TYPE(rela->r_info); + symidx = ELF_R_SYM(rela->r_info); break; default: panic("elf_reloc: unknown relocation mode %d\n", type); @@ -71,9 +73,8 @@ break; case R_ALPHA_REFQUAD: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -81,9 +82,8 @@ break; case R_ALPHA_GLOB_DAT: - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; addr += addend; if (*where != addr) @@ -92,9 +92,8 @@ case R_ALPHA_JMP_SLOT: /* No point in lazy binding for kernel modules. */ - addr = (Elf_Addr) - linker_file_lookup_symbol(lf, sym, 1); - if (addr == NULL) + addr = elf_lookup(lf, symidx, 1); + if (addr == 0) return -1; if (*where != addr) *where = addr; ==== //depot/projects/trustedbsd/audit/sys/alpha/alpha/pmap.c#6 (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.91 2002/04/15 16:07:52 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.92 2002/04/29 07:43:08 peter Exp $ */ /* @@ -222,7 +222,7 @@ * Given a map and a machine independent protection code, * convert to an alpha protection code. */ -#define pte_prot(m, p) (protection_codes[m == pmap_kernel() ? 0 : 1][p]) +#define pte_prot(m, p) (protection_codes[m == kernel_pmap ? 0 : 1][p]) int protection_codes[2][8]; /* @@ -296,8 +296,7 @@ /* * Statically allocated kernel pmap */ -static struct pmap kernel_pmap_store; -pmap_t kernel_pmap; +struct pmap kernel_pmap_store; vm_offset_t avail_start; /* PA of first available physical page */ vm_offset_t avail_end; /* PA of last available physical page */ @@ -531,13 +530,9 @@ alpha_protection_init(); /* - * The kernel's pmap is statically allocated so we don't have to use - * pmap_create, which is unlikely to work correctly at this part of - * the boot sequence (XXX and which no longer exists). + * Initialize the kernel pmap (which is statically allocated). */ - kernel_pmap = &kernel_pmap_store; kernel_pmap->pm_lev1 = Lev1map; - kernel_pmap->pm_count = 1; kernel_pmap->pm_active = ~0; kernel_pmap->pm_asn[alpha_pal_whami()].asn = 0; kernel_pmap->pm_asn[alpha_pal_whami()].gen = 1; @@ -1356,7 +1351,6 @@ int i; pmap->pm_lev1 = Lev1map; - pmap->pm_count = 1; pmap->pm_ptphint = NULL; pmap->pm_active = 0; for (i = 0; i < MAXCPU; i++) { @@ -1407,7 +1401,6 @@ pmap->pm_lev1[PTLEV1I] = pmap_phys_to_pte(VM_PAGE_TO_PHYS(lev1pg)) | PG_V | PG_KRE | PG_KWE; - pmap->pm_count = 1; pmap->pm_ptphint = NULL; pmap->pm_active = 0; for (i = 0; i < MAXCPU; i++) { @@ -1775,39 +1768,9 @@ critical_exit(); } -/* - * Retire the given physical map from service. - * Should only be called if the map contains - * no valid mappings. - */ -void -pmap_destroy(pmap_t pmap) -{ - int count; - if (pmap == NULL) - return; - - count = --pmap->pm_count; - if (count == 0) { - pmap_release(pmap); - panic("destroying a pmap is not yet implemented"); - } -} - -/* - * Add a reference to the specified pmap. - */ -void -pmap_reference(pmap_t pmap) -{ - if (pmap != NULL) { - pmap->pm_count++; - } -} - /*************************************************** -* page management routines. + * page management routines. ***************************************************/ /* @@ -2691,16 +2654,6 @@ { } -/* - * Routine: pmap_kernel - * Function: - * Returns the physical map handle for the kernel. - */ -pmap_t -pmap_kernel() -{ - return (kernel_pmap); -} /* * pmap_zero_page zeros the specified hardware page by ==== //depot/projects/trustedbsd/audit/sys/alpha/alpha/trap.c#5 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.91 2002/04/16 05:56:01 alc Exp $ */ +/* $FreeBSD: src/sys/alpha/alpha/trap.c,v 1.92 2002/04/27 09:34:15 alc Exp $ */ /* $NetBSD: trap.c,v 1.31 1998/03/26 02:21:46 thorpej Exp $ */ /* @@ -472,7 +472,6 @@ goto out; } - mtx_lock(&Giant); /* * It is only a kernel address space fault iff: * 1. !user and @@ -515,7 +514,6 @@ break; #ifdef DIAGNOSTIC default: /* XXX gcc -Wuninitialized */ - mtx_unlock(&Giant); goto dopanic; #endif } @@ -531,20 +529,8 @@ ++p->p_lock; PROC_UNLOCK(p); - /* - * Grow the stack if necessary - */ - /* vm_map_growstack fails only if va falls into - * a growable stack region and the stack growth - * fails. It succeeds if va was not within - * a growable stack region, or if the stack - * growth succeeded. - */ - if (vm_map_growstack(p, va) != KERN_SUCCESS) - rv = KERN_FAILURE; - else - /* Fault in the user page: */ - rv = vm_fault(map, va, ftype, + /* Fault in the user page: */ + rv = vm_fault(map, va, ftype, (ftype & VM_PROT_WRITE) ? VM_FAULT_DIRTY : VM_FAULT_NORMAL); @@ -559,7 +545,6 @@ */ rv = vm_fault(map, va, ftype, VM_FAULT_NORMAL); } - mtx_unlock(&Giant); if (rv == KERN_SUCCESS) goto out; ==== //depot/projects/trustedbsd/audit/sys/alpha/include/pmap.h#5 (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.16 2002/03/20 18:58:45 obrien Exp $ + * $FreeBSD: src/sys/alpha/include/pmap.h,v 1.17 2002/04/29 07:43:08 peter Exp $ */ #ifndef _MACHINE_PMAP_H_ @@ -173,7 +173,6 @@ pt_entry_t *pm_lev1; /* KVA of lev0map */ vm_object_t pm_pteobj; /* Container for pte's */ TAILQ_HEAD(,pv_entry) pm_pvlist; /* list of mappings in pmap */ - int pm_count; /* reference count */ u_int32_t pm_active; /* active cpus */ struct { u_int32_t asn:ASN_BITS; /* address space number */ @@ -192,7 +191,8 @@ typedef struct pmap *pmap_t; #ifdef _KERNEL -extern pmap_t kernel_pmap; +extern struct pmap kernel_pmap_store; +#define kernel_pmap (&kernel_pmap_store) #endif /* @@ -231,7 +231,6 @@ void pmap_bootstrap(vm_offset_t, u_int); void pmap_setdevram(unsigned long long basea, vm_offset_t sizea); int pmap_uses_prom_console(void); -pmap_t pmap_kernel(void); void *pmap_mapdev(vm_offset_t, vm_size_t); void pmap_unmapdev(vm_offset_t, vm_size_t); unsigned *pmap_pte(pmap_t, vm_offset_t) __pure2; ==== //depot/projects/trustedbsd/audit/sys/alpha/isa/isa_dma.c#2 (text+ko) ==== @@ -35,7 +35,7 @@ * * from: @(#)isa.c 7.2 (Berkeley) 5/13/91 * from: isa_dma.c,v 1.3 1999/05/09 23:56:00 peter Exp $ - * $FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.6 2001/06/30 05:29:10 imp Exp $ + * $FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.7 2002/04/29 07:43:09 peter Exp $ */ /* @@ -239,7 +239,7 @@ panic("isa_dmastart: transfer mapping not contiguous"); if ((chipset.sgmap == NULL) && - (pmap_extract(pmap_kernel(), (vm_offset_t)addr) + (pmap_extract(kernel_pmap, (vm_offset_t)addr) > BUS_SPACE_MAXADDR_24BIT)) { /* we bounced */ dma_bounced |= (1 << chan); ==== //depot/projects/trustedbsd/audit/sys/boot/forth/loader.conf#4 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.55 2002/03/04 03:51:19 alfred Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.58 2002/04/26 22:31:18 wes Exp $ ############################################################## ### Basic configuration options ############################ @@ -22,7 +22,7 @@ userconfig_script_name="/boot/kernel.conf" userconfig_script_type="userconfig_script" -loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local" +loader_conf_files="/boot/device.hints /boot/loader.conf /boot/loader.conf.local /boot/nextboot.conf" verbose_loading="NO" # Set to YES for verbose loader output @@ -77,6 +77,8 @@ #kern.vm.kmem.size="" # Sets the size of kernel memory (bytes) #machdep.pccard.pcic_irq="0" # Assigns PCCARD controller IRQ (0=polled) #net.inet.tcp.tcbhashsize="" # Set the value of TCBHASHSIZE +#vfs.root.mountfrom="" # Specify root partition in a way the + # kernel understands #debug.ktr.cpumask="0xf" # Bitmask of CPUs to enable KTR on #debug.ktr.mask="0x1200" # Bitmask of KTR events to enable #debug.ktr.verbose="1" # Enable console dump of KTR events ==== //depot/projects/trustedbsd/audit/sys/boot/pc98/kgzldr/Makefile#3 (text+ko) ==== @@ -1,5 +1,6 @@ -# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.2 2002/04/15 13:44:00 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/kgzldr/Makefile,v 1.3 2002/04/25 13:28:10 nyan Exp $ +FILES= kgzldr.o SRCS= start.s boot.c inflate.c lib.c crt.s sio.s OBJS= ${SRCS:N*.h:R:S/$/.o/g} CFLAGS= -fno-builtin @@ -10,23 +11,20 @@ .endif CFLAGS+=-DKZIP LDFLAGS=-nostdlib -static -r -NOMAN= BINDIR= /usr/lib -BINMODE=444 -STRIP= .PATH: ${.CURDIR}/../../../kern .PATH: ${.CURDIR}/../../i386/kgzldr AFLAGS+=--defsym PC98=1 +CLEANFILES=${FILES} + M4?= m4 M4FLAGS=-DOBJFORMAT=${OBJFORMAT} BOOT_COMCONSOLE_PORT?= 0x238 M4FLAGS+=-DSIOPRT=${BOOT_COMCONSOLE_PORT} -all: kgzldr.o - kgzldr.o: ${OBJS} ${CC} ${LDFLAGS} -o ${.TARGET} ${OBJS} ==== //depot/projects/trustedbsd/audit/sys/boot/pc98/loader/Makefile#3 (text+ko) ==== @@ -1,8 +1,7 @@ -# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.24 2002/03/30 11:18:30 nyan Exp $ +# $FreeBSD: src/sys/boot/pc98/loader/Makefile,v 1.25 2002/04/25 13:31:27 nyan Exp $ BASE= loader PROG= ${BASE} -#NOMAN= STRIP= NEWVERSWHAT= "bootstrap loader" pc98 BINDIR?= /boot @@ -94,7 +93,7 @@ sh ${.CURDIR}/../../common/newvers.sh ${.CURDIR}/../../i386/loader/version ${NEWVERSWHAT} ${CC} -c vers.c -${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} ${BASE}.help +${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN} ${BTXCRT} btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ -b ${BTXKERN} ${BASE}.bin # /usr/bin/kzip ${.TARGET} @@ -107,24 +106,13 @@ ${BASE}.help: help.common help.i386 cat ${.ALLSRC} | awk -f ${.CURDIR}/../../common/merge_help.awk > ${.TARGET} -beforeinstall: -.if exists(${.OBJDIR}/loader.help) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.OBJDIR}/${BASE}.help ${DESTDIR}/boot -.else - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/${BASE}.help ${DESTDIR}/boot -.endif +.PATH: ${.CURDIR}/../../forth +FILES= ${BASE}.help loader.4th support.4th loader.conf +FILESDIR_loader.conf= /boot/defaults + .if !exists(${DESTDIR}/boot/loader.rc) - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.rc ${DESTDIR}/boot +FILES+= loader.rc .endif - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/support.4th ${DESTDIR}/boot - ${INSTALL} -C -o ${BINOWN} -g ${BINGRP} -m 444 \ - ${.CURDIR}/../../forth/loader.conf ${DESTDIR}/boot/defaults .include <${.CURDIR}/../Makefile.inc> ==== //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/Makefile#3 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.4 2002/04/21 02:37:55 obrien Exp $ +# $FreeBSD: src/sys/boot/sparc64/boot1/Makefile,v 1.5 2002/04/24 02:50:36 jake Exp $ PROG= boot1 SRCS= _start.S boot1.c @@ -9,7 +9,7 @@ BOOTBLOCKBASE= 0x4000 -CFLAGS= -W -Wall -I../../ -I../../common/ -Os -ffreestanding -mno-app-regs \ +CFLAGS= -W -Wall -Wno-unused -I../../ -I../../common/ -Os -ffreestanding \ -mcmodel=medlow boot1.elf: _start.o boot1.o ==== //depot/projects/trustedbsd/audit/sys/boot/sparc64/boot1/boot1.c#2 (text+ko) ==== @@ -17,7 +17,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.3 2002/03/05 11:22:43 robert Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/sparc64/boot1/boot1.c,v 1.10 2002/04/24 05:54:10 jake Exp $"); #include <sys/param.h> #include <sys/reboot.h> @@ -30,86 +30,66 @@ #include <ufs/ffs/fs.h> #include <ufs/ufs/dinode.h> -#include <a.out.h> +#define _PATH_LOADER "/boot/loader" +#define _PATH_KERNEL "/boot/kernel/kernel" -#define RBX_ASKNAME 0x0 /* -a */ -#define RBX_SINGLE 0x1 /* -s */ -#define RBX_DFLTROOT 0x5 /* -r */ -#define RBX_KDB 0x6 /* -d */ -#define RBX_CONFIG 0xa /* -c */ -#define RBX_VERBOSE 0xb /* -v */ -#define RBX_CDROM 0xd /* -C */ -#define RBX_GDB 0xf /* -g */ +#define BSIZEMAX 8192 -#define RBX_MASK 0x2000ffff +typedef int putc_func_t(int c, void *arg); +typedef int32_t ofwh_t; -#define PATH_CONFIG "/boot.config" -#define PATH_LOADER "/boot/loader" -#define PATH_KERNEL "/kernel" +struct sp_data { + char *sp_buf; + u_int sp_len; + u_int sp_size; +}; -#define ARGS 0x900 -#define NOPT 11 -#define BSIZEMAX 8192 -#define NDEV 5 +static const char digits[] = "0123456789abcdef"; -#define TYPE_AD 0 -#define TYPE_WD 1 -#define TYPE_WFD 2 -#define TYPE_FD 3 -#define TYPE_DA 4 +static char bootpath[128]; +static char bootargs[128]; -/* - * This structure will be refined along with the addition of a bootpath - * parsing routine when it is necessary to cope with bootpaths that are - * not in the exact <devpath>@<controller>,<disk>:<partition> format and - * for which we need to evaluate the disklabel ourselves. - */ -struct disk { - int meta; -}; -struct disk dsk; +static ofwh_t bootdev; -extern uint32_t _end; +static struct fs fs; +static ino_t inomap; +static char blkbuf[BSIZEMAX]; +static unsigned int fsblks; -static const char optstr[NOPT] = "aCcgrsv"; -static const unsigned char flags[NOPT] = { - RBX_ASKNAME, - RBX_CDROM, - RBX_CONFIG, - RBX_GDB, - RBX_DFLTROOT, - RBX_SINGLE, - RBX_VERBOSE -}; +static uint32_t fs_off; -static char cmd[512]; /* command to parse */ -static char bname[1024]; /* name of the binary to load */ -static uint32_t opts; -static int ls; -static uint32_t fs_off; +int main(int ac, char **av); -int main(void); -void exit(int); +static void exit(int) __dead2; static void load(const char *); -static int parse(char *); static ino_t lookup(const char *); -static int xfsread(ino_t, void *, size_t); static ssize_t fsread(ino_t, void *, size_t); static int dskread(void *, u_int64_t, int); -static int printf(const char *, ...); -static int putchar(int); -static int keyhit(unsigned int); -static int getc(void); + +static void usage(void); + +static void bcopy(const void *src, void *dst, size_t len); +static void bzero(void *b, size_t len); + +static int mount(const char *device); + +static void panic(const char *fmt, ...) __dead2; +static int printf(const char *fmt, ...); +static int putchar(int c, void *arg); +static int vprintf(const char *fmt, va_list ap); +static int vsnprintf(char *str, size_t sz, const char *fmt, va_list ap); -static void *memcpy(void *, const void *, size_t); -static void *memset(void *, int, size_t); -static void *malloc(size_t); +static int __printf(const char *fmt, putc_func_t *putc, void *arg, va_list ap); +static int __putc(int c, void *arg); +static int __puts(const char *s, putc_func_t *putc, void *arg); +static int __sputc(int c, void *arg); +static char *__uitoa(char *buf, u_int val, int base); +static char *__ultoa(char *buf, u_long val, int base); /* * Open Firmware interface functions */ typedef u_int64_t ofwcell_t; -typedef int32_t ofwh_t; typedef u_int32_t u_ofwh_t; typedef int (*ofwfp_t)(ofwcell_t []); ofwfp_t ofw; /* the prom Open Firmware entry */ @@ -121,10 +101,10 @@ int ofw_read(ofwh_t, void *, size_t); int ofw_write(ofwh_t, const void *, size_t); int ofw_seek(ofwh_t, u_int64_t); +void ofw_exit(void) __dead2; ofwh_t bootdevh; ofwh_t stdinh, stdouth; -char bootpath[64]; /* * This has to stay here, as the PROM seems to ignore the @@ -135,20 +115,36 @@ ofw_init(int d, int d1, int d2, int d3, ofwfp_t ofwaddr) { ofwh_t chosenh; + char *av[16]; + char *p; + int ac; ofw = ofwaddr; chosenh = ofw_finddevice("/chosen"); ofw_getprop(chosenh, "stdin", &stdinh, sizeof(stdinh)); ofw_getprop(chosenh, "stdout", &stdouth, sizeof(stdouth)); + ofw_getprop(chosenh, "bootargs", bootargs, sizeof(bootargs)); ofw_getprop(chosenh, "bootpath", bootpath, sizeof(bootpath)); - if ((bootdevh = ofw_open(bootpath)) == -1) { - printf("Could not open boot device.\n"); - } + bootargs[sizeof(bootargs) - 1] = '\0'; + bootpath[sizeof(bootpath) - 1] = '\0'; + + ac = 0; >>> 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?200205010002.g4102YM05161>