Date: Tue, 16 Sep 2003 11:20:46 -0700 (PDT) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 38140 for review Message-ID: <200309161820.h8GIKkh4026904@repoman.freebsd.org>
index | next in thread | raw e-mail
http://perforce.freebsd.org/chv.cgi?CH=38140 Change 38140 by sam@sam_ebb on 2003/09/16 11:20:42 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/pmap.c#7 integrate .. //depot/projects/netperf/sys/alpha/include/db_machdep.h#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/machdep.c#4 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#8 integrate .. //depot/projects/netperf/sys/amd64/conf/GENERIC#3 integrate .. //depot/projects/netperf/sys/amd64/include/signal.h#2 integrate .. //depot/projects/netperf/sys/boot/forth/beastie.4th#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/comconsole.c#3 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/acpi_stub.c#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/bootinfo.c#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/devicename.c#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/efi_stub.c#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/elf_freebsd.c#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/module.c#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/sal_stub.c#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/skifs.c#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/ssc.c#2 integrate .. //depot/projects/netperf/sys/boot/ia64/libski/time.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/boot2/boot.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/boot2/disk.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/boot2/io.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/boot2/probe_keyboard.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/boot2/sys.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/boot2/table.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/libpc98/biosdisk.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/libpc98/biosmem.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/libpc98/comconsole.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/libpc98/gatea20.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/libpc98/i386_module.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/libpc98/time.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/libpc98/vidconsole.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/loader/conf.c#2 integrate .. //depot/projects/netperf/sys/boot/pc98/loader/main.c#2 integrate .. //depot/projects/netperf/sys/cam/cam_periph.c#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_cd.c#5 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_sa.c#2 integrate .. //depot/projects/netperf/sys/coda/cnode.h#2 integrate .. //depot/projects/netperf/sys/coda/coda.h#2 integrate .. //depot/projects/netperf/sys/coda/coda_namecache.c#2 integrate .. //depot/projects/netperf/sys/coda/coda_namecache.h#2 integrate .. //depot/projects/netperf/sys/coda/coda_psdev.c#2 integrate .. //depot/projects/netperf/sys/coda/coda_subr.c#2 integrate .. //depot/projects/netperf/sys/coda/coda_subr.h#2 integrate .. //depot/projects/netperf/sys/coda/coda_venus.c#2 integrate .. //depot/projects/netperf/sys/coda/coda_venus.h#2 integrate .. //depot/projects/netperf/sys/coda/coda_vfsops.c#2 integrate .. //depot/projects/netperf/sys/coda/coda_vfsops.h#2 integrate .. //depot/projects/netperf/sys/coda/coda_vnops.c#3 integrate .. //depot/projects/netperf/sys/compat/linprocfs/linprocfs.c#4 integrate .. //depot/projects/netperf/sys/compat/linux/linux_misc.c#4 integrate .. //depot/projects/netperf/sys/conf/NOTES#8 integrate .. //depot/projects/netperf/sys/conf/files#8 integrate .. //depot/projects/netperf/sys/conf/files.alpha#3 integrate .. //depot/projects/netperf/sys/conf/files.amd64#4 integrate .. //depot/projects/netperf/sys/conf/files.i386#6 integrate .. //depot/projects/netperf/sys/conf/files.ia64#5 integrate .. //depot/projects/netperf/sys/conf/files.pc98#5 integrate .. //depot/projects/netperf/sys/conf/files.sparc64#3 integrate .. //depot/projects/netperf/sys/conf/kmod.mk#4 integrate .. //depot/projects/netperf/sys/conf/ldscript.ia64#2 integrate .. //depot/projects/netperf/sys/conf/options#9 integrate .. //depot/projects/netperf/sys/conf/options.ia64#3 integrate .. //depot/projects/netperf/sys/crypto/sha2/sha2.c#2 integrate .. //depot/projects/netperf/sys/dev/aac/aac.c#5 integrate .. //depot/projects/netperf/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#6 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_acad.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cmbat.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_ec.c#5 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_resource.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpiio.h#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpivar.h#3 integrate .. //depot/projects/netperf/sys/dev/acpica/madt.h#1 branch .. //depot/projects/netperf/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#5 integrate .. //depot/projects/netperf/sys/dev/ata/ata-lowlevel.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/netperf/sys/dev/ata/ata-raid.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cam.c#5 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cd.c#5 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cd.h#4 integrate .. //depot/projects/netperf/sys/dev/ath/if_ath.c#13 integrate .. //depot/projects/netperf/sys/dev/ath/if_athioctl.h#5 integrate .. //depot/projects/netperf/sys/dev/ath/if_athvar.h#4 integrate .. //depot/projects/netperf/sys/dev/bfe/if_bfe.c#1 branch .. //depot/projects/netperf/sys/dev/bfe/if_bfereg.h#1 branch .. //depot/projects/netperf/sys/dev/ciss/ciss.c#4 integrate .. //depot/projects/netperf/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/netperf/sys/dev/drm/drm_context.h#3 integrate .. //depot/projects/netperf/sys/dev/drm/drm_memory.h#3 integrate .. //depot/projects/netperf/sys/dev/drm/radeon.h#3 integrate .. //depot/projects/netperf/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/netperf/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/netperf/sys/dev/drm/radeon_drv.c#3 integrate .. //depot/projects/netperf/sys/dev/drm/radeon_drv.h#3 integrate .. //depot/projects/netperf/sys/dev/drm/radeon_mem.c#3 integrate .. //depot/projects/netperf/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/netperf/sys/dev/drm/sis.h#1 branch .. //depot/projects/netperf/sys/dev/drm/sis_drm.h#1 branch .. //depot/projects/netperf/sys/dev/drm/sis_drv.c#1 branch .. //depot/projects/netperf/sys/dev/drm/sis_drv.h#1 branch .. //depot/projects/netperf/sys/dev/drm/sis_ds.c#1 branch .. //depot/projects/netperf/sys/dev/drm/sis_ds.h#1 branch .. //depot/projects/netperf/sys/dev/drm/sis_mm.c#1 branch .. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#9 integrate .. //depot/projects/netperf/sys/dev/fxp/if_fxpvar.h#3 integrate .. //depot/projects/netperf/sys/dev/ic/ns16550.h#2 integrate .. //depot/projects/netperf/sys/dev/ips/ips.h#3 integrate .. //depot/projects/netperf/sys/dev/ips/ips_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/isp/isp.c#4 integrate .. //depot/projects/netperf/sys/dev/isp/isp_freebsd.c#3 integrate .. //depot/projects/netperf/sys/dev/isp/isp_freebsd.h#2 integrate .. //depot/projects/netperf/sys/dev/isp/isp_inline.h#2 integrate .. //depot/projects/netperf/sys/dev/isp/isp_target.c#2 integrate .. //depot/projects/netperf/sys/dev/isp/isp_target.h#2 integrate .. //depot/projects/netperf/sys/dev/isp/isp_tpublic.h#2 integrate .. //depot/projects/netperf/sys/dev/isp/ispvar.h#2 integrate .. //depot/projects/netperf/sys/dev/mii/bmtphy.c#3 integrate .. //depot/projects/netperf/sys/dev/mii/miidevs#2 integrate .. //depot/projects/netperf/sys/dev/mii/rgephy.c#1 branch .. //depot/projects/netperf/sys/dev/mii/rgephyreg.h#1 branch .. //depot/projects/netperf/sys/dev/mii/rlphy.c#3 integrate .. //depot/projects/netperf/sys/dev/pci/pci.c#6 integrate .. //depot/projects/netperf/sys/dev/pci/pcireg.h#5 integrate .. //depot/projects/netperf/sys/dev/pci/pcivar.h#3 integrate .. //depot/projects/netperf/sys/dev/pst/pst-raid.c#4 integrate .. //depot/projects/netperf/sys/dev/puc/puc.c#4 integrate .. //depot/projects/netperf/sys/dev/puc/puc_ebus.c#1 branch .. //depot/projects/netperf/sys/dev/puc/puc_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/puc/puc_sbus.c#1 branch .. //depot/projects/netperf/sys/dev/puc/pucdata.c#5 integrate .. //depot/projects/netperf/sys/dev/puc/pucvar.h#2 integrate .. //depot/projects/netperf/sys/dev/re/if_re.c#1 branch .. //depot/projects/netperf/sys/dev/sio/sio.c#4 integrate .. //depot/projects/netperf/sys/dev/sio/sioreg.h#2 integrate .. //depot/projects/netperf/sys/dev/smbus/smbus.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/isa/ad1816.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/isa/ess.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/isa/mpu.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/isa/mss.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/isa/sb16.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/isa/sb8.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/isa/sndbuf_dma.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/isa/uartsio.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/aureal.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/aureal.h#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/emu10k1.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/es137x.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ich.c#6 integrate .. //depot/projects/netperf/sys/dev/sound/pci/maestro.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/neomagic-coeff.h#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/neomagic.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/neomagic.h#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/solo.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/t4dwave.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/t4dwave.h#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/ac97.c#5 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/ac97.h#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/buffer.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/buffer.h#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/channel.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/channel.h#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/dsp.h#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/fake.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/feeder.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/feeder.h#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/feeder_fmt.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/mixer.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/mixer.h#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/sndstat.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/sound.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/sound.h#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/vchan.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/vchan.h#2 integrate .. //depot/projects/netperf/sys/dev/uart/uart.h#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_bus.h#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_bus_acpi.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_bus_ebus.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_bus_isa.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_bus_pccard.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_bus_pci.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_bus_puc.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_core.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_cpu.h#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_cpu_alpha.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_cpu_amd64.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_cpu_i386.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_cpu_ia64.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_cpu_pc98.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_cpu_sparc64.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_dev_i8251.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_dev_i8251.h#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_dev_ns8250.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_dev_ns8250.h#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_dev_sab82532.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_dev_sab82532.h#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_dev_z8530.c#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_dev_z8530.h#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_if.m#1 branch .. //depot/projects/netperf/sys/dev/uart/uart_tty.c#1 branch .. //depot/projects/netperf/sys/dev/wi/if_wi.c#8 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi_pccard.c#6 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi_pci.c#6 integrate .. //depot/projects/netperf/sys/dev/wi/if_wireg.h#4 integrate .. //depot/projects/netperf/sys/dev/wi/if_wivar.h#3 integrate .. //depot/projects/netperf/sys/geom/bde/g_bde_crypt.c#2 integrate .. //depot/projects/netperf/sys/geom/geom_io.c#3 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakeup.c#4 integrate .. //depot/projects/netperf/sys/i386/conf/GENERIC#3 integrate .. //depot/projects/netperf/sys/i386/conf/NOTES#3 integrate .. //depot/projects/netperf/sys/i386/i386/db_interface.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/identcpu.c#5 integrate .. //depot/projects/netperf/sys/i386/i386/machdep.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/mp_clock.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#5 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#8 integrate .. //depot/projects/netperf/sys/i386/i386/sys_machdep.c#4 integrate .. //depot/projects/netperf/sys/i386/include/acpica_machdep.h#2 integrate .. //depot/projects/netperf/sys/i386/include/apic.h#4 integrate .. //depot/projects/netperf/sys/i386/include/segments.h#2 integrate .. //depot/projects/netperf/sys/i386/isa/clock.c#4 integrate .. //depot/projects/netperf/sys/i386/isa/npx.c#2 integrate .. //depot/projects/netperf/sys/i386/linux/imgact_linux.c#2 integrate .. //depot/projects/netperf/sys/i386/pci/pci_cfgreg.c#3 integrate .. //depot/projects/netperf/sys/ia64/acpica/madt.c#3 integrate .. //depot/projects/netperf/sys/ia64/conf/GENERIC#2 integrate .. //depot/projects/netperf/sys/ia64/conf/GENERIC.hints#2 integrate .. //depot/projects/netperf/sys/ia64/conf/NOTES#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/exception.S#4 integrate .. //depot/projects/netperf/sys/ia64/ia64/genassym.c#3 integrate .. //depot/projects/netperf/sys/ia64/ia64/interrupt.c#4 integrate .. //depot/projects/netperf/sys/ia64/ia64/locore.S#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#8 integrate .. //depot/projects/netperf/sys/ia64/ia64/nexus.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/pmap.c#5 integrate .. //depot/projects/netperf/sys/ia64/ia64/sapic.c#2 integrate .. //depot/projects/netperf/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/netperf/sys/ia64/include/sapicvar.h#2 integrate .. //depot/projects/netperf/sys/ia64/include/vmparam.h#2 integrate .. //depot/projects/netperf/sys/isa/fd.c#3 integrate .. //depot/projects/netperf/sys/kern/bus_if.m#2 integrate .. //depot/projects/netperf/sys/kern/init_sysent.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_ktr.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_prot.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_xxx.c#3 integrate .. //depot/projects/netperf/sys/kern/subr_bus.c#3 integrate .. //depot/projects/netperf/sys/kern/subr_taskqueue.c#4 integrate .. //depot/projects/netperf/sys/kern/subr_trap.c#3 integrate .. //depot/projects/netperf/sys/kern/subr_witness.c#3 integrate .. //depot/projects/netperf/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/netperf/sys/kern/syscalls.c#2 integrate .. //depot/projects/netperf/sys/kern/syscalls.master#2 integrate .. //depot/projects/netperf/sys/kern/vfs_aio.c#2 integrate .. //depot/projects/netperf/sys/kern/vfs_bio.c#5 integrate .. //depot/projects/netperf/sys/kern/vfs_mount.c#2 integrate .. //depot/projects/netperf/sys/modules/Makefile#5 integrate .. //depot/projects/netperf/sys/modules/bfe/Makefile#1 branch .. //depot/projects/netperf/sys/modules/coda/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/coda5/Makefile#1 branch .. //depot/projects/netperf/sys/modules/drm/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/drm/sis/Makefile#1 branch .. //depot/projects/netperf/sys/modules/mii/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/re/Makefile#1 branch .. //depot/projects/netperf/sys/modules/uart/Makefile#1 branch .. //depot/projects/netperf/sys/net/if_iso88025subr.c#2 integrate .. //depot/projects/netperf/sys/net/raw_usrreq.c#2 integrate .. //depot/projects/netperf/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/netperf/sys/net80211/ieee80211.h#2 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_input.c#6 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_ioctl.c#2 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_node.c#7 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_output.c#5 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_var.h#4 integrate .. //depot/projects/netperf/sys/netinet/ip_mroute.c#11 integrate .. //depot/projects/netperf/sys/netinet/tcp_subr.c#3 integrate .. //depot/projects/netperf/sys/netinet6/in6_ifattach.c#4 integrate .. //depot/projects/netperf/sys/netinet6/in6_pcb.c#4 integrate .. //depot/projects/netperf/sys/netinet6/nd6.c#5 integrate .. //depot/projects/netperf/sys/netinet6/nd6_nbr.c#2 integrate .. //depot/projects/netperf/sys/netipx/ipx_input.c#3 integrate .. //depot/projects/netperf/sys/netipx/spx_usrreq.c#2 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_node.c#2 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_subs.c#2 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_vnops.c#5 integrate .. //depot/projects/netperf/sys/nfsclient/nfsnode.h#2 integrate .. //depot/projects/netperf/sys/pc98/conf/GENERIC#2 integrate .. //depot/projects/netperf/sys/pc98/conf/NOTES#4 integrate .. //depot/projects/netperf/sys/pc98/i386/machdep.c#3 integrate .. //depot/projects/netperf/sys/pc98/pc98/clock.c#5 integrate .. //depot/projects/netperf/sys/pc98/pc98/fd.c#2 integrate .. //depot/projects/netperf/sys/pci/amdpm.c#4 integrate .. //depot/projects/netperf/sys/pci/if_dc.c#6 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#8 integrate .. //depot/projects/netperf/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#10 integrate .. //depot/projects/netperf/sys/pci/if_sisreg.h#4 integrate .. //depot/projects/netperf/sys/pci/if_xl.c#5 integrate .. //depot/projects/netperf/sys/pci/if_xlreg.h#2 integrate .. //depot/projects/netperf/sys/posix4/ksched.c#2 integrate .. //depot/projects/netperf/sys/sparc64/conf/GENERIC#3 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/ofw_machdep.c#4 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/pmap.c#5 integrate .. //depot/projects/netperf/sys/sys/ata.h#4 integrate .. //depot/projects/netperf/sys/sys/bus.h#2 integrate .. //depot/projects/netperf/sys/sys/interrupt.h#3 integrate .. //depot/projects/netperf/sys/sys/param.h#4 integrate .. //depot/projects/netperf/sys/sys/syscall.h#2 integrate .. //depot/projects/netperf/sys/sys/syscall.mk#2 integrate .. //depot/projects/netperf/sys/sys/syslimits.h#2 integrate .. //depot/projects/netperf/sys/sys/sysproto.h#2 integrate .. //depot/projects/netperf/sys/sys/taskqueue.h#4 integrate .. //depot/projects/netperf/sys/vm/pmap.h#2 integrate .. //depot/projects/netperf/sys/vm/vm_kern.c#6 integrate .. //depot/projects/netperf/sys/vm/vm_mmap.c#3 integrate .. //depot/projects/netperf/sys/vm/vm_object.c#4 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/pmap.c#7 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.135 2003/08/28 23:12:28 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.138 2003/09/12 07:07:47 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -811,7 +811,31 @@ return 0; } +/* + * Routine: pmap_extract_and_hold + * Function: + * Atomically extract and hold the physical page + * with the given pmap and virtual address pair + * if that mapping permits the given protection. + */ +vm_page_t +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) +{ + vm_paddr_t pa; + vm_page_t m; + m = NULL; + mtx_lock(&Giant); + if ((pa = pmap_extract(pmap, va)) != 0) { + m = PHYS_TO_VM_PAGE(pa); + vm_page_lock_queues(); + vm_page_hold(m); + vm_page_unlock_queues(); + } + mtx_unlock(&Giant); + return (m); +} + /*************************************************** * Low level mapping routines..... ***************************************************/ @@ -2749,23 +2773,30 @@ */ if ((*pte & PG_FOW) == 0) val |= MINCORE_MODIFIED|MINCORE_MODIFIED_OTHER; - /* - * Modified by someone - */ - else if (m->dirty || pmap_is_modified(m)) - val |= MINCORE_MODIFIED_OTHER; + else { + /* + * Modified by someone + */ + vm_page_lock_queues(); + if (m->dirty || pmap_is_modified(m)) + val |= MINCORE_MODIFIED_OTHER; + vm_page_unlock_queues(); + } /* * Referenced by us */ if ((*pte & (PG_FOR | PG_FOE)) == 0) val |= MINCORE_REFERENCED|MINCORE_REFERENCED_OTHER; - - /* - * Referenced by someone - */ - else if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) { - val |= MINCORE_REFERENCED_OTHER; - vm_page_flag_set(m, PG_REFERENCED); + else { + /* + * Referenced by someone + */ + vm_page_lock_queues(); + if ((m->flags & PG_REFERENCED) || pmap_ts_referenced(m)) { + val |= MINCORE_REFERENCED_OTHER; + vm_page_flag_set(m, PG_REFERENCED); + } + vm_page_unlock_queues(); } } return val; ==== //depot/projects/netperf/sys/alpha/include/db_machdep.h#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/db_machdep.h,v 1.7 2003/02/25 00:42:39 marcel Exp $ */ +/* $FreeBSD: src/sys/alpha/include/db_machdep.h,v 1.8 2003/09/07 05:33:46 marcel Exp $ */ /* $NetBSD: db_machdep.h,v 1.6 1997/09/06 02:02:25 thorpej Exp $ */ /* @@ -34,8 +34,9 @@ /* * Machine-dependent defines for new kernel debugger. */ - +#ifndef KLD_MODULE #include "opt_ddb.h" +#endif #include <sys/param.h> #include <vm/vm.h> ==== //depot/projects/netperf/sys/amd64/amd64/exception.S#2 (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.110 2003/05/14 04:10:47 peter Exp $ + * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.111 2003/09/09 19:32:09 peter Exp $ */ #include <machine/asmacros.h> @@ -227,8 +227,8 @@ swapgs movq %rsp,PCPU(SCRATCH_RSP) movq common_tss+COMMON_TSS_RSP0,%rsp - /* Now emulate a trapframe. Ugh. */ - subq $TF_SIZE,%rsp + /* Now emulate a trapframe. Make the 8 byte alignment odd for call. */ + subq $TF_SIZE+8,%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/netperf/sys/amd64/amd64/machdep.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.588 2003/07/31 01:26:39 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.589 2003/09/09 19:32:09 peter Exp $"); #include "opt_atalk.h" #include "opt_compat.h" @@ -1217,6 +1217,8 @@ /* make an initial tss so cpu can get interrupt stack on syscall! */ common_tss.tss_rsp0 = thread0.td_kstack + KSTACK_PAGES * PAGE_SIZE - sizeof(struct pcb); + /* Ensure the stack is aligned to 16 bytes */ + common_tss.tss_rsp0 &= ~0xF; /* doublefault stack space, runs on ist1 */ common_tss.tss_ist1 = (long)&dblfault_stack[sizeof(dblfault_stack)]; @@ -1434,7 +1436,6 @@ struct trapframe *tp; tp = td->td_frame; - PROC_LOCK(curthread->td_proc); mcp->mc_onstack = sigonstack(tp->tf_rsp); PROC_UNLOCK(curthread->td_proc); @@ -1486,66 +1487,42 @@ return (EINVAL); rflags = (mcp->mc_rflags & PSL_USERCHANGE) | (tp->tf_rflags & ~PSL_USERCHANGE); - if ((ret = set_fpcontext(td, mcp)) == 0) { - tp->tf_r15 = mcp->mc_r15; - tp->tf_r14 = mcp->mc_r14; - tp->tf_r13 = mcp->mc_r13; - tp->tf_r12 = mcp->mc_r12; - tp->tf_r11 = mcp->mc_r11; - tp->tf_r10 = mcp->mc_r10; - tp->tf_r9 = mcp->mc_r9; - tp->tf_r8 = mcp->mc_r8; - tp->tf_rdi = mcp->mc_rdi; - tp->tf_rsi = mcp->mc_rsi; - tp->tf_rbp = mcp->mc_rbp; - tp->tf_rbx = mcp->mc_rbx; - tp->tf_rdx = mcp->mc_rdx; - tp->tf_rcx = mcp->mc_rcx; - tp->tf_rax = mcp->mc_rax; - tp->tf_rip = mcp->mc_rip; - tp->tf_rflags = rflags; - tp->tf_rsp = mcp->mc_rsp; - tp->tf_ss = mcp->mc_ss; - ret = 0; - } - return (ret); + ret = set_fpcontext(td, mcp); + if (ret != 0) + return (ret); + tp->tf_r15 = mcp->mc_r15; + tp->tf_r14 = mcp->mc_r14; + tp->tf_r13 = mcp->mc_r13; + tp->tf_r12 = mcp->mc_r12; + tp->tf_r11 = mcp->mc_r11; + tp->tf_r10 = mcp->mc_r10; + tp->tf_r9 = mcp->mc_r9; + tp->tf_r8 = mcp->mc_r8; + tp->tf_rdi = mcp->mc_rdi; + tp->tf_rsi = mcp->mc_rsi; + tp->tf_rbp = mcp->mc_rbp; + tp->tf_rbx = mcp->mc_rbx; + tp->tf_rdx = mcp->mc_rdx; + tp->tf_rcx = mcp->mc_rcx; + tp->tf_rax = mcp->mc_rax; + tp->tf_rip = mcp->mc_rip; + tp->tf_rflags = rflags; + tp->tf_rsp = mcp->mc_rsp; + tp->tf_ss = mcp->mc_ss; + return (0); } static void get_fpcontext(struct thread *td, mcontext_t *mcp) { - struct savefpu *addr; - /* - * XXX mc_fpstate might be misaligned, since its declaration is not - * unportabilized using __attribute__((aligned(16))) like the - * declaration of struct savemm, and anyway, alignment doesn't work - * for auto variables since we don't use gcc's pessimal stack - * alignment. Work around this by abusing the spare fields after - * mcp->mc_fpstate. - * - * XXX unpessimize most cases by only aligning when fxsave might be - * called, although this requires knowing too much about - * npxgetregs()'s internals. - */ - addr = (struct savefpu *)&mcp->mc_fpstate; - if (td == PCPU_GET(fpcurthread) && ((uintptr_t)(void *)addr & 0xF)) { - do - addr = (void *)((char *)addr + 4); - while ((uintptr_t)(void *)addr & 0xF); - } - mcp->mc_ownedfp = npxgetregs(td, addr); - if (addr != (struct savefpu *)&mcp->mc_fpstate) { - bcopy(addr, &mcp->mc_fpstate, sizeof(mcp->mc_fpstate)); - bzero(&mcp->mc_spare2, sizeof(mcp->mc_spare2)); - } + mcp->mc_ownedfp = npxgetregs(td, (struct savefpu *)&mcp->mc_fpstate); mcp->mc_fpformat = npxformat(); } static int set_fpcontext(struct thread *td, const mcontext_t *mcp) { - struct savefpu *addr; if (mcp->mc_fpformat == _MC_FPFMT_NODEV) return (0); @@ -1556,25 +1533,12 @@ fpstate_drop(td); else if (mcp->mc_ownedfp == _MC_FPOWNED_FPU || mcp->mc_ownedfp == _MC_FPOWNED_PCB) { - /* XXX align as above. */ - addr = (struct savefpu *)&mcp->mc_fpstate; - if (td == PCPU_GET(fpcurthread) && - ((uintptr_t)(void *)addr & 0xF)) { - do - addr = (void *)((char *)addr + 4); - while ((uintptr_t)(void *)addr & 0xF); - bcopy(&mcp->mc_fpstate, addr, sizeof(mcp->mc_fpstate)); - } /* * XXX we violate the dubious requirement that npxsetregs() * be called with interrupts disabled. + * XXX obsolete on trap-16 systems? */ - npxsetregs(td, addr); - /* - * Don't bother putting things back where they were in the - * misaligned case, since we know that the caller won't use - * them again. - */ + npxsetregs(td, (struct savefpu *)&mcp->mc_fpstate); } else return (EINVAL); return (0); ==== //depot/projects/netperf/sys/amd64/amd64/pmap.c#8 (text+ko) ==== @@ -73,7 +73,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.434 2003/08/24 08:07:06 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.437 2003/09/13 21:57:38 alc Exp $"); /* * Manages physical address maps. @@ -749,6 +749,31 @@ } +/* + * Routine: pmap_extract_and_hold + * Function: + * Atomically extract and hold the physical page + * with the given pmap and virtual address pair + * if that mapping permits the given protection. + */ +vm_page_t +pmap_extract_and_hold(pmap_t pmap, vm_offset_t va, vm_prot_t prot) +{ + vm_paddr_t pa; + vm_page_t m; + + m = NULL; + mtx_lock(&Giant); + if ((pa = pmap_extract(pmap, va)) != 0) { + m = PHYS_TO_VM_PAGE(pa); + vm_page_lock_queues(); + vm_page_hold(m); + vm_page_unlock_queues(); + } + mtx_unlock(&Giant); + return (m); +} + vm_paddr_t pmap_kextract(vm_offset_t va) { @@ -961,10 +986,6 @@ if (va >= VM_MAXUSER_ADDRESS) return 0; - if (mpte == NULL) { - mpte = PHYS_TO_VM_PAGE(*pmap_pde(pmap, va)); - } - return pmap_unwire_pte_hold(pmap, va, mpte); } @@ -1442,7 +1463,7 @@ pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t va) { pt_entry_t oldpte; - vm_page_t m; + vm_page_t m, mpte; oldpte = pte_load_clear(ptq); if (oldpte & PG_W) @@ -1471,10 +1492,9 @@ vm_page_flag_set(m, PG_REFERENCED); return pmap_remove_entry(pmap, m, va); } else { - return pmap_unuse_pt(pmap, va, NULL); + mpte = PHYS_TO_VM_PAGE(*pmap_pde(pmap, va)); + return pmap_unuse_pt(pmap, va, mpte); } - - return 0; } /* ==== //depot/projects/netperf/sys/amd64/conf/GENERIC#3 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.391 2003/09/03 01:24:47 obrien Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.395 2003/09/15 22:40:00 obrien Exp $ machine amd64 cpu HAMMER @@ -118,8 +118,8 @@ # RAID controllers #XXX pointer/int warnings -#device aac # Adaptec FSA RAID -#device aacp # SCSI passthrough for aac (requires CAM) +device aac # Adaptec FSA RAID +device aacp # SCSI passthrough for aac (requires CAM) device amr # AMI MegaRAID device ida # Compaq Smart RAID device ips # IBM (Adaptec) ServeRAID @@ -168,9 +168,11 @@ # PCI Ethernet NICs that use the common MII bus controller code. # NOTE: Be sure to keep the 'device miibus' line in order to use these NICs! device miibus # MII bus support +device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) device pcn # AMD Am79C97x PCI 10/100 (precedence over 'lnc') +device re # RealTek 8139C+/8169/8169S/8110S device rl # RealTek 8129/8139 device sf # Adaptec AIC-6915 (``Starfire'') device sis # Silicon Integrated Systems SiS 900/SiS 7016 @@ -182,7 +184,6 @@ device vr # VIA Rhine, Rhine II device wb # Winbond W89C840F device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'') -device bge # Broadcom BCM570xx Gigabit Ethernet # ISA Ethernet NICs. pccard nics included. device cs # Crystal Semiconductor CS89x0 NIC @@ -248,3 +249,5 @@ device firewire # FireWire bus code device sbp # SCSI over FireWire (Requires scbus and da) device fwe # Ethernet over FireWire (non-standard!) + +device pcm # Sound ==== //depot/projects/netperf/sys/amd64/include/signal.h#2 (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.21 2003/05/01 01:05:23 peter Exp $ + * $FreeBSD: src/sys/amd64/include/signal.h,v 1.23 2003/09/08 18:31:48 peter Exp $ */ #ifndef _MACHINE_SIGNAL_H_ @@ -74,22 +74,23 @@ struct sigcontext { struct __sigset sc_mask; /* signal mask to restore */ long sc_onstack; /* sigstack state to restore */ - long sc_r15; /* machine state (struct trapframe) */ - long sc_r14; - long sc_r13; - long sc_r12; - long sc_r11; - long sc_r10; - long sc_r9; - long sc_r8; - long sc_rdi; + long sc_rdi; /* machine state (struct trapframe) */ long sc_rsi; - long sc_rbp; - long sc_rbx; long sc_rdx; long sc_rcx; + long sc_r8; + long sc_r9; long sc_rax; + long sc_rbx; + long sc_rbp; + long sc_r10; + long sc_r11; + long sc_r12; + long sc_r13; + long sc_r14; + long sc_r15; long sc_trapno; + long sc_addr; long sc_err; long sc_rip; long sc_cs; @@ -104,7 +105,7 @@ long sc_fpformat; long sc_ownedfp; long sc_spare1[1]; - long sc_fpstate[128] __aligned(16); + long sc_fpstate[64] __aligned(16); long sc_spare2[8]; }; #endif /* __BSD_VISIBLE */ ==== //depot/projects/netperf/sys/boot/forth/beastie.4th#2 (text+ko) ==== @@ -1,4 +1,5 @@ \ Copyright (c) 2003 Scott Long <scottl@freebsd.org> +\ Copyright (c) 2003 Aleksander Fafula <alex@fafula.com> \ All rights reserved. \ \ Redistribution and use in source and binary forms, with or without @@ -22,7 +23,7 @@ \ OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF \ SUCH DAMAGE. \ -\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.4 2003/06/10 22:04:09 scottl Exp $ +\ $FreeBSD: src/sys/boot/forth/beastie.4th,v 1.5 2003/09/13 18:35:01 scottl Exp $ marker task-beastie.4th @@ -48,7 +49,29 @@ 46 constant dot \ The BSD Daemon. He is 19 rows high and 34 columns wide -: print-beastie ( x y -- ) +: technicolor-beastie ( x y -- ) +2dup at-xy ." [1;31m, ," 1+ +2dup at-xy ." /( )`" 1+ +2dup at-xy ." \ \___ / |" 1+ +2dup at-xy ." /- [37m_[31m `-/ '" 1+ +2dup at-xy ." ([37m/\/ \[31m \ /\" 1+ +2dup at-xy ." [37m/ / |[31m ` \" 1+ +2dup at-xy ." [34mO O [37m) [31m/ |" 1+ +2dup at-xy ." [37m`-^--'[31m`< '" 1+ +2dup at-xy ." (_.) _ ) /" 1+ +2dup at-xy ." `.___/` / " 1+ +2dup at-xy ." `-----' /" 1+ +2dup at-xy ." [33m<----.[31m __ / __ \" 1+ +2dup at-xy ." [33m<----|====[31mO)))[33m==[31m) \) /[33m====|" 1+ +2dup at-xy ." [33m<----'[31m `--' `.__,' \" 1+ +2dup at-xy ." | |" 1+ +2dup at-xy ." \ / /\" 1+ +2dup at-xy ." [36m______[31m( (_ / \______/" 1+ +2dup at-xy ." [36m,' ,-----' |" 1+ +at-xy ." `--{__________) [0m" 1+ +; + +: boring-beastie ( x y -- ) 2dup at-xy ." , ," 1+ 2dup at-xy ." /( )`" 1+ 2dup at-xy ." \ \___ / |" 1+ @@ -70,6 +93,20 @@ at-xy ." `--{__________)" ; +: print-beastie ( x y -- ) + s" loader_color" getenv + dup -1 = if + drop + boring-beastie + exit + then + s" YES" compare-insensitive 0<> if + boring-beastie + exit + then + technicolor-beastie +; + : acpienabled? ( -- flag ) s" acpi_load" getenv dup -1 = if ==== //depot/projects/netperf/sys/boot/i386/libi386/comconsole.c#3 (text+ko) ==== @@ -24,33 +24,14 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/comconsole.c,v 1.9 2003/08/25 23:28:31 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/comconsole.c,v 1.10 2003/09/16 11:24:23 bde Exp $"); #include <stand.h> #include <bootstrap.h> #include <machine/cpufunc.h> +#include <dev/ic/ns16550.h> #include "libi386.h" -/* selected defines from ns16550.h */ -#define com_data 0 /* data register (R/W) */ -#define com_dlbl 0 /* divisor latch low (W) */ -#define com_dlbh 1 /* divisor latch high (W) */ -#define com_ier 1 /* interrupt enable (W) */ -#define com_iir 2 /* interrupt identification (R) */ -#define com_fifo 2 /* FIFO control (W) */ -#define com_lctl 3 /* line control register (R/W) */ -#define com_cfcr 3 /* line control register (R/W) */ -#define com_mcr 4 /* modem control register (R/W) */ -#define com_lsr 5 /* line status register (R/W) */ -#define com_msr 6 /* modem status register (R/W) */ - -/* selected defines from sioreg.h */ -#define CFCR_DLAB 0x80 -#define MCR_RTS 0x02 -#define MCR_DTR 0x01 -#define LSR_TXRDY 0x20 -#define LSR_RXRDY 0x01 - #define COMC_FMT 0x3 /* 8N1 */ #define COMC_TXWAIT 0x40000 /* transmit timeout */ #define COMC_BPS(x) (115200 / (x)) /* speed to DLAB divisor */ ==== //depot/projects/netperf/sys/boot/ia64/libski/acpi_stub.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/boot/ia64/libski/acpi_stub.c,v 1.1 2003/02/01 22:50:08 marcel Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/acpi_stub.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); + #include <contrib/dev/acpica/acpi.h> #define APIC_IO_SAPIC 6 ==== //depot/projects/netperf/sys/boot/ia64/libski/bootinfo.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/ia64/libski/bootinfo.c,v 1.8 2003/02/20 06:47:54 marcel Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/bootinfo.c,v 1.9 2003/09/08 09:11:32 obrien Exp $"); + #include <stand.h> #include <string.h> #include <sys/param.h> ==== //depot/projects/netperf/sys/boot/ia64/libski/devicename.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * LIABILITY, OR TORT (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/boot/ia64/libski/devicename.c,v 1.1 2001/09/12 08:34:26 dfr Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/devicename.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); + #include <stand.h> #include <string.h> #include <sys/disklabel.h> ==== //depot/projects/netperf/sys/boot/ia64/libski/efi_stub.c#2 (text+ko) ==== @@ -22,10 +22,11 @@ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT * (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/boot/ia64/libski/efi_stub.c,v 1.1 2003/02/01 22:50:08 marcel Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/efi_stub.c,v 1.2 2003/09/08 09:11:32 obrien Exp $"); + #include <sys/types.h> #include <machine/bootinfo.h> #include <efi.h> ==== //depot/projects/netperf/sys/boot/ia64/libski/elf_freebsd.c#2 (text+ko) ==== @@ -1,4 +1,3 @@ -/* $FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.8 2003/05/01 03:56:29 peter Exp $ */ /* $NetBSD: loadfile.c,v 1.10 1998/06/25 06:45:46 ross Exp $ */ /*- @@ -37,7 +36,6 @@ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE * POSSIBILITY OF SUCH DAMAGE. */ - /* * Copyright (c) 1992, 1993 * The Regents of the University of California. All rights reserved. @@ -76,6 +74,9 @@ * @(#)boot.c 8.1 (Berkeley) 6/10/93 */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/elf_freebsd.c,v 1.9 2003/09/08 09:11:32 obrien Exp $"); + #include <stand.h> #include <string.h> ==== //depot/projects/netperf/sys/boot/ia64/libski/module.c#2 (text+ko) ==== @@ -24,9 +24,8 @@ * SUCH DAMAGE. */ - #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/ia64/libski/module.c,v 1.2 2003/04/03 21:36:29 obrien Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<help
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309161820.h8GIKkh4026904>