Date: Tue, 2 Sep 2003 16:53:39 -0700 (PDT) From: Sam Leffler <sam@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 37406 for review Message-ID: <200309022353.h82NrduW025043@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=37406 Change 37406 by sam@sam_ebb on 2003/09/02 16:52:39 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/pmap.c#6 integrate .. //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#6 integrate .. //depot/projects/netperf/sys/alpha/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/amd64/acpica/OsdEnvironment.c#3 integrate .. //depot/projects/netperf/sys/amd64/acpica/acpi_machdep.c#3 integrate .. //depot/projects/netperf/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#5 integrate .. //depot/projects/netperf/sys/amd64/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/amd64/pci/pci_bus.c#4 integrate .. //depot/projects/netperf/sys/boot/common/bcache.c#2 integrate .. //depot/projects/netperf/sys/boot/common/boot.c#2 integrate .. //depot/projects/netperf/sys/boot/common/commands.c#2 integrate .. //depot/projects/netperf/sys/boot/common/console.c#2 integrate .. //depot/projects/netperf/sys/boot/common/dev_net.c#2 integrate .. //depot/projects/netperf/sys/boot/common/devopen.c#2 integrate .. //depot/projects/netperf/sys/boot/common/interp.c#2 integrate .. //depot/projects/netperf/sys/boot/common/interp_backslash.c#2 integrate .. //depot/projects/netperf/sys/boot/common/interp_forth.c#2 integrate .. //depot/projects/netperf/sys/boot/common/interp_parse.c#2 integrate .. //depot/projects/netperf/sys/boot/common/isapnp.c#2 integrate .. //depot/projects/netperf/sys/boot/common/load.c#2 integrate .. //depot/projects/netperf/sys/boot/common/load_elf.c#2 integrate .. //depot/projects/netperf/sys/boot/common/load_elf32.c#2 integrate .. //depot/projects/netperf/sys/boot/common/load_elf64.c#2 integrate .. //depot/projects/netperf/sys/boot/common/ls.c#2 integrate .. //depot/projects/netperf/sys/boot/common/misc.c#2 integrate .. //depot/projects/netperf/sys/boot/common/module.c#2 integrate .. //depot/projects/netperf/sys/boot/common/panic.c#2 integrate .. //depot/projects/netperf/sys/boot/common/pnp.c#2 integrate .. //depot/projects/netperf/sys/boot/common/ufsread.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/boot2/boot2.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/kgzldr/boot.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/kgzldr/lib.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biosacpi.c#3 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biosdisk.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biosmem.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biospci.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biospnp.c#3 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/bootinfo.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/bootinfo32.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/bootinfo64.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/comconsole.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/devicename.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/elf32_freebsd.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/elf64_freebsd.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/gatea20.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/i386_copy.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/i386_module.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/nullconsole.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/pread.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/pxe.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/time.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/libi386/vidconsole.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/loader/conf.c#2 integrate .. //depot/projects/netperf/sys/boot/i386/loader/main.c#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#8 integrate .. //depot/projects/netperf/sys/conf/files#7 integrate .. //depot/projects/netperf/sys/conf/files.i386#5 integrate .. //depot/projects/netperf/sys/conf/files.pc98#4 integrate .. //depot/projects/netperf/sys/conf/majors#3 integrate .. //depot/projects/netperf/sys/conf/options.i386#2 integrate .. //depot/projects/netperf/sys/ddb/db_ps.c#3 integrate .. //depot/projects/netperf/sys/dev/aac/aac.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/Osd/OsdHardware.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_cpu.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_lid.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_powerres.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_resource.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_thermal.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_timer.c#4 integrate .. //depot/projects/netperf/sys/dev/acpica/acpica_support.c#3 delete .. //depot/projects/netperf/sys/dev/acpica/acpica_support.h#2 delete .. //depot/projects/netperf/sys/dev/acpica/acpiio.h#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpivar.h#2 integrate .. //depot/projects/netperf/sys/dev/advansys/adv_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/advansys/adw_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/ahc_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/ahd_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx.h#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/amr/amr_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/an/if_an_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/asr/asr.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/ata-all.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-dma.c#6 integrate .. //depot/projects/netperf/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.h#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-queue.c#2 integrate .. //depot/projects/netperf/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/netperf/sys/dev/ath/if_ath.c#11 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_core.c#6 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_os.c#5 integrate .. //depot/projects/netperf/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/netperf/sys/dev/buslogic/bt_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/cardbus/cardbus_cis.c#3 integrate .. //depot/projects/netperf/sys/dev/dpt/dpt_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/em/README#2 integrate .. //depot/projects/netperf/sys/dev/em/if_em.c#4 integrate .. //depot/projects/netperf/sys/dev/em/if_em.h#5 integrate .. //depot/projects/netperf/sys/dev/em/if_em_hw.c#3 integrate .. //depot/projects/netperf/sys/dev/em/if_em_hw.h#2 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep_isa.c#3 integrate .. //depot/projects/netperf/sys/dev/ep/if_ep_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/exca/exca.c#3 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp.c#5 integrate .. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/netperf/sys/dev/gem/if_gem_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#5 integrate .. //depot/projects/netperf/sys/dev/hea/hea_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/hifn/hifn7751.c#6 integrate .. //depot/projects/netperf/sys/dev/hifn/hifn7751reg.h#2 integrate .. //depot/projects/netperf/sys/dev/hme/if_hme_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/hme/if_hme_sbus.c#3 integrate .. //depot/projects/netperf/sys/dev/ichsmb/ichsmb_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/ida/ida_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/ips/ips_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/isp/isp.c#3 integrate .. //depot/projects/netperf/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/netperf/sys/dev/lnc/if_lnc_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/mlx/mlx.c#3 integrate .. //depot/projects/netperf/sys/dev/mlx/mlxvar.h#2 integrate .. //depot/projects/netperf/sys/dev/mly/mly.c#4 integrate .. //depot/projects/netperf/sys/dev/mpt/mpt_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/musycc/musycc.c#4 integrate .. //depot/projects/netperf/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/netperf/sys/dev/pccard/pccardvar.h#2 integrate .. //depot/projects/netperf/sys/dev/pci/pci.c#4 integrate .. //depot/projects/netperf/sys/dev/pci/pcireg.h#3 integrate .. //depot/projects/netperf/sys/dev/puc/puc_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/sbni/if_sbni_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/sbsh/if_sbsh.c#4 integrate .. //depot/projects/netperf/sys/dev/sio/sio.c#3 integrate .. //depot/projects/netperf/sys/dev/sio/sio_isa.c#3 integrate .. //depot/projects/netperf/sys/dev/sio/sio_pccard.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/als4000.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/au88x0.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/aureal.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/cmi.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/cs4281.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csa.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csamidi.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csapcm.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ds1.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/emu10k1.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/es137x.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/fm801.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ich.c#4 integrate .. //depot/projects/netperf/sys/dev/sound/pci/maestro.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/maestro3.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/neomagic.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/solo.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/t4dwave.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/via8233.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/via82c686.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/ac97.c#4 integrate .. //depot/projects/netperf/sys/dev/stg/tmc18c30_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/sym/sym_hipd.c#4 integrate .. //depot/projects/netperf/sys/dev/syscons/scgfbrndr.c#3 integrate .. //depot/projects/netperf/sys/dev/syscons/syscons.c#3 integrate .. //depot/projects/netperf/sys/dev/tdfx/tdfx_pci.c#4 integrate .. //depot/projects/netperf/sys/dev/trm/trm.c#6 integrate .. //depot/projects/netperf/sys/dev/tx/if_txreg.h#2 integrate .. //depot/projects/netperf/sys/dev/usb/ucom.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ufm.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ugen.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/uhid.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ulpt.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ums.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/urio.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/usb.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/usb_mem.h#2 integrate .. //depot/projects/netperf/sys/dev/usb/usb_subr.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/uscanner.c#3 integrate .. //depot/projects/netperf/sys/dev/vx/if_vx_pci.c#4 integrate .. //depot/projects/netperf/sys/fs/specfs/spec_vnops.c#4 integrate .. //depot/projects/netperf/sys/geom/geom.h#2 integrate .. //depot/projects/netperf/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/netperf/sys/geom/geom_dev.c#4 integrate .. //depot/projects/netperf/sys/geom/geom_disk.c#2 integrate .. //depot/projects/netperf/sys/geom/geom_mbr.c#3 integrate .. //depot/projects/netperf/sys/geom/geom_pc98.c#2 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate .. //depot/projects/netperf/sys/gnu/ext2fs/fs.h#2 integrate .. //depot/projects/netperf/sys/i386/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakecode.S#2 integrate .. //depot/projects/netperf/sys/i386/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/atomic.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/bios.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/db_disasm.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/db_interface.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/db_trace.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/dump_machdep.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/elan-mmcr.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/elf_machdep.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/geode.c#1 branch .. //depot/projects/netperf/sys/i386/i386/i386-gdbstub.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/i686_mem.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/initcpu.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/k6_mem.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/legacy.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/mp_clock.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/mp_machdep.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/mpapic.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/nexus.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/perfmon.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#7 integrate .. //depot/projects/netperf/sys/i386/i386/sys_machdep.c#3 integrate .. //depot/projects/netperf/sys/i386/i386/tsc.c#4 integrate .. //depot/projects/netperf/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/vm_machdep.c#3 integrate .. //depot/projects/netperf/sys/i386/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/i386/isa/bs/bshw_dma.c#2 integrate .. //depot/projects/netperf/sys/i386/pci/pci_bus.c#4 integrate .. //depot/projects/netperf/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#3 integrate .. //depot/projects/netperf/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#3 integrate .. //depot/projects/netperf/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#3 integrate .. //depot/projects/netperf/sys/i4b/layer1/itjc/i4b_itjc_pci.c#3 integrate .. //depot/projects/netperf/sys/i4b/layer1/iwic/i4b_iwic_pci.c#3 integrate .. //depot/projects/netperf/sys/ia64/acpica/OsdEnvironment.c#2 integrate .. //depot/projects/netperf/sys/ia64/acpica/acpi_machdep.c#2 integrate .. //depot/projects/netperf/sys/ia64/acpica/acpi_wakeup.c#2 integrate .. //depot/projects/netperf/sys/ia64/conf/NOTES#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/machdep.c#7 integrate .. //depot/projects/netperf/sys/ia64/ia64/vm_machdep.c#5 integrate .. //depot/projects/netperf/sys/kern/kern_mac.c#4 integrate .. //depot/projects/netperf/sys/kern/kern_thread.c#6 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#4 integrate .. //depot/projects/netperf/sys/kern/uipc_mbuf.c#2 integrate .. //depot/projects/netperf/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/netperf/sys/kern/vfs_bio.c#4 integrate .. //depot/projects/netperf/sys/kern/vfs_cluster.c#2 integrate .. //depot/projects/netperf/sys/modules/Makefile#4 integrate .. //depot/projects/netperf/sys/modules/acpi/Makefile#2 integrate .. //depot/projects/netperf/sys/modules/pst/Makefile#1 branch .. //depot/projects/netperf/sys/net/if_ethersubr.c#4 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_output.c#4 integrate .. //depot/projects/netperf/sys/netatalk/aarp.c#3 integrate .. //depot/projects/netperf/sys/netatalk/ddp_output.c#2 integrate .. //depot/projects/netperf/sys/netinet/igmp.c#3 integrate .. //depot/projects/netperf/sys/netinet/ip_flow.c#3 integrate .. //depot/projects/netperf/sys/netinet/ip_flow.h#3 integrate .. //depot/projects/netperf/sys/netinet/ip_output.c#4 integrate .. //depot/projects/netperf/sys/netinet/raw_ip.c#5 integrate .. //depot/projects/netperf/sys/netipsec/ipsec.c#3 integrate .. //depot/projects/netperf/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_input.c#4 integrate .. //depot/projects/netperf/sys/netipsec/ipsec_output.c#3 integrate .. //depot/projects/netperf/sys/netipsec/key.c#3 integrate .. //depot/projects/netperf/sys/netipsec/key.h#3 integrate .. //depot/projects/netperf/sys/netipsec/keydb.h#3 integrate .. //depot/projects/netperf/sys/netipsec/xform_ah.c#3 integrate .. //depot/projects/netperf/sys/netipsec/xform_esp.c#3 integrate .. //depot/projects/netperf/sys/netipsec/xform_ipcomp.c#3 integrate .. //depot/projects/netperf/sys/nfsclient/nfs_vnops.c#3 integrate .. //depot/projects/netperf/sys/pc98/pc98/sio.c#3 integrate .. //depot/projects/netperf/sys/pc98/pc98/syscons.c#2 delete .. //depot/projects/netperf/sys/pccard/i82365.h#2 integrate .. //depot/projects/netperf/sys/pccard/pcic.c#2 integrate .. //depot/projects/netperf/sys/pci/amdpm.c#3 integrate .. //depot/projects/netperf/sys/pci/if_dc.c#5 integrate .. //depot/projects/netperf/sys/pci/if_mn.c#3 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#6 integrate .. //depot/projects/netperf/sys/pci/meteor.c#5 integrate .. //depot/projects/netperf/sys/pci/xrpu.c#3 integrate .. //depot/projects/netperf/sys/powerpc/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/powerpc/powerpc/vm_machdep.c#4 integrate .. //depot/projects/netperf/sys/sparc64/include/ofw_machdep.h#2 integrate .. //depot/projects/netperf/sys/sparc64/include/varargs.h#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/machdep.c#4 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/mp_machdep.c#3 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/ofw_machdep.c#3 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/netperf/sys/sys/buf.h#3 integrate .. //depot/projects/netperf/sys/sys/mac.h#4 integrate .. //depot/projects/netperf/sys/sys/mbuf.h#2 integrate .. //depot/projects/netperf/sys/ufs/ffs/ffs_softdep.c#2 integrate .. //depot/projects/netperf/sys/vm/swap_pager.c#5 integrate .. //depot/projects/netperf/sys/vm/vm_init.c#3 integrate .. //depot/projects/netperf/sys/vm/vm_kern.c#5 integrate .. //depot/projects/netperf/sys/vm/vm_map.c#4 integrate .. //depot/projects/netperf/sys/vm/vm_map.h#4 integrate .. //depot/projects/netperf/sys/vm/vm_page.c#4 integrate .. //depot/projects/netperf/sys/vm/vm_page.h#3 integrate .. //depot/projects/netperf/sys/vm/vm_pageout.c#4 integrate .. //depot/projects/netperf/sys/vm/vnode_pager.c#6 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/pmap.c#6 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.134 2003/08/20 20:12:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.135 2003/08/28 23:12:28 alc Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -340,7 +340,6 @@ static int pmap_release_free_page(pmap_t pmap, vm_page_t p); static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); -static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); #ifdef SMP static void pmap_invalidate_page_action(void *arg); @@ -914,22 +913,6 @@ return ALPHA_PHYS_TO_K0SEG(start); } - -static vm_page_t -pmap_page_lookup(vm_object_t object, vm_pindex_t pindex) -{ - vm_page_t m; -retry: - m = vm_page_lookup(object, pindex); - if (m != NULL) { - vm_page_lock_queues(); - if (vm_page_sleep_if_busy(m, FALSE, "pplookp")) - goto retry; - vm_page_unlock_queues(); - } - return m; -} - /*************************************************** * Page table page management routines..... ***************************************************/ @@ -967,10 +950,8 @@ if (m->pindex < NUSERLEV3MAPS) { /* unhold the level 2 page table */ vm_page_t lev2pg; - lev2pg = vm_page_lookup(pmap->pm_pteobj, - NUSERLEV3MAPS + pmap_lev1_index(va)); - while (vm_page_sleep_if_busy(lev2pg, FALSE, "pulook")) - vm_page_lock_queues(); + + lev2pg = PHYS_TO_VM_PAGE(pmap_pte_pa(pmap_lev1pte(pmap, va))); vm_page_unhold(lev2pg); if (lev2pg->hold_count == 0) _pmap_unwire_pte_hold(pmap, va, lev2pg); @@ -1027,9 +1008,7 @@ (pmap->pm_ptphint->pindex == ptepindex)) { mpte = pmap->pm_ptphint; } else { - while ((mpte = vm_page_lookup(pmap->pm_pteobj, ptepindex)) != NULL && - vm_page_sleep_if_busy(mpte, FALSE, "pulook")) - vm_page_lock_queues(); + mpte = PHYS_TO_VM_PAGE(pmap_pte_pa(pmap_lev2pte(pmap, va))); pmap->pm_ptphint = mpte; } } @@ -1240,9 +1219,9 @@ if (!pmap_pte_v(l1pte)) _pmap_allocpte(pmap, NUSERLEV3MAPS + l1index); else { - vm_page_t l2page = - pmap_page_lookup(pmap->pm_pteobj, - NUSERLEV3MAPS + l1index); + vm_page_t l2page; + + l2page = PHYS_TO_VM_PAGE(pmap_pte_pa(l1pte)); l2page->hold_count++; } l2map = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(pmap_pte_pa(l1pte)); @@ -1297,7 +1276,7 @@ (pmap->pm_ptphint->pindex == ptepindex)) { m = pmap->pm_ptphint; } else { - m = pmap_page_lookup(pmap->pm_pteobj, ptepindex); + m = PHYS_TO_VM_PAGE(pmap_pte_pa(lev2pte)); pmap->pm_ptphint = m; } m->hold_count++; @@ -1999,7 +1978,6 @@ if (mpte && (mpte->pindex == ptepindex)) { mpte->hold_count++; } else { -retry: /* * Get the level 2 entry */ @@ -2014,12 +1992,9 @@ (pmap->pm_ptphint->pindex == ptepindex)) { mpte = pmap->pm_ptphint; } else { - mpte = pmap_page_lookup(pmap->pm_pteobj, - ptepindex); + mpte = PHYS_TO_VM_PAGE(pmap_pte_pa(l2pte)); pmap->pm_ptphint = mpte; } - if (mpte == NULL) - goto retry; mpte->hold_count++; } else { mpte = _pmap_allocpte(pmap, ptepindex); ==== //depot/projects/netperf/sys/alpha/alpha/vm_machdep.c#6 (text+ko) ==== @@ -67,7 +67,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.93 2003/08/16 23:15:13 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.94 2003/08/29 20:04:09 alc Exp $"); #include "opt_kstack_pages.h" @@ -82,6 +82,8 @@ #include <sys/vnode.h> #include <sys/vmmeter.h> #include <sys/kernel.h> +#include <sys/mbuf.h> +#include <sys/socketvar.h> #include <sys/sysctl.h> #include <sys/unistd.h> @@ -101,6 +103,20 @@ #include <sys/user.h> +static void sf_buf_init(void *arg); +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) + +/* + * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the + * sf_freelist head with the sf_lock mutex. + */ +static struct { + SLIST_HEAD(, sf_buf) sf_head; + struct mtx sf_lock; +} sf_freelist; + +static u_int sf_buf_alloc_want; + /* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child @@ -370,6 +386,91 @@ } /* + * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) + */ +static void +sf_buf_init(void *arg) +{ + struct sf_buf *sf_bufs; + vm_offset_t sf_base; + int i; + + mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); + mtx_lock(&sf_freelist.sf_lock); + SLIST_INIT(&sf_freelist.sf_head); + sf_base = kmem_alloc_nofault(kernel_map, nsfbufs * PAGE_SIZE); + sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, + M_NOWAIT | M_ZERO); + for (i = 0; i < nsfbufs; i++) { + sf_bufs[i].kva = sf_base + i * PAGE_SIZE; + SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); + } + sf_buf_alloc_want = 0; + mtx_unlock(&sf_freelist.sf_lock); +} + +/* + * Get an sf_buf from the freelist. Will block if none are available. + */ +struct sf_buf * +sf_buf_alloc(struct vm_page *m) +{ + struct sf_buf *sf; + int error; + + mtx_lock(&sf_freelist.sf_lock); + while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { + sf_buf_alloc_want++; + error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH, + "sfbufa", 0); + sf_buf_alloc_want--; + + /* + * If we got a signal, don't risk going back to sleep. + */ + if (error) + break; + } + if (sf != NULL) { + SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); + sf->m = m; + pmap_qenter(sf->kva, &sf->m, 1); + } + mtx_unlock(&sf_freelist.sf_lock); + return (sf); +} + +/* + * Detatch mapped page and release resources back to the system. + */ +void +sf_buf_free(void *addr, void *args) +{ + struct sf_buf *sf; + struct vm_page *m; + + sf = args; + pmap_qremove((vm_offset_t)addr, 1); + m = sf->m; + vm_page_lock_queues(); + vm_page_unwire(m, 0); + /* + * Check for the object going away on us. This can + * happen since we don't hold a reference to it. + * If so, we're responsible for freeing the page. + */ + if (m->wire_count == 0 && m->object == NULL) + vm_page_free(m); + vm_page_unlock_queues(); + sf->m = NULL; + mtx_lock(&sf_freelist.sf_lock); + SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + if (sf_buf_alloc_want > 0) + wakeup_one(&sf_freelist); + mtx_unlock(&sf_freelist.sf_lock); +} + +/* * Software interrupt handler for queued VM system processing. */ void ==== //depot/projects/netperf/sys/alpha/include/varargs.h#2 (text+ko) ==== @@ -38,11 +38,11 @@ * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 * $NetBSD: varargs.h,v 1.7 1997/04/06 08:47:46 cgd Exp $ - * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.5 2002/10/06 22:02:06 mike Exp $ + * $FreeBSD: src/sys/alpha/include/varargs.h,v 1.6 2003/09/01 03:01:45 kan Exp $ */ -#ifndef _ALPHA_VARARGS_H_ -#define _ALPHA_VARARGS_H_ +#ifndef _MACHINE_VARARGS_H_ +#define _MACHINE_VARARGS_H_ #if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) @@ -80,4 +80,4 @@ #endif /* __GNUC__ post GCC 2.95 */ -#endif /* !_ALPHA_VARARGS_H_ */ +#endif /* !_MACHINE_VARARGS_H_ */ ==== //depot/projects/netperf/sys/amd64/acpica/OsdEnvironment.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.10 2003/07/25 21:10:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/OsdEnvironment.c,v 1.11 2003/08/28 16:30:31 njl Exp $"); /* * 6.1 : Environmental support @@ -40,7 +40,7 @@ u_long amd64_acpi_root; SYSCTL_ULONG(_machdep, OID_AUTO, acpi_root, CTLFLAG_RD, &amd64_acpi_root, 0, - "The physical address of the RSDP"); + "The physical address of the RSDP"); ACPI_STATUS AcpiOsInitialize(void) ==== //depot/projects/netperf/sys/amd64/acpica/acpi_machdep.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.10 2003/07/25 21:10:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_machdep.c,v 1.11 2003/08/28 16:30:31 njl Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -38,9 +38,8 @@ { struct acpi_softc *sc; - if ((sc = device_get_softc(dev)) == NULL) { + if ((sc = device_get_softc(dev)) == NULL) return (ENXIO); - } acpi_install_wakeup_handler(sc); ==== //depot/projects/netperf/sys/amd64/acpica/acpi_wakeup.c#3 (text+ko) ==== @@ -26,7 +26,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.20 2003/07/25 21:10:19 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/acpica/acpi_wakeup.c,v 1.21 2003/08/28 16:30:31 njl Exp $"); #include <sys/param.h> #include <sys/bus.h> @@ -37,7 +37,6 @@ int acpi_sleep_machdep(struct acpi_softc *sc, int state) { - return (0); } ==== //depot/projects/netperf/sys/amd64/amd64/vm_machdep.c#5 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.216 2003/08/16 23:15:14 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.217 2003/08/29 20:04:09 alc Exp $"); #include "opt_isa.h" #include "opt_kstack_pages.h" @@ -57,7 +57,9 @@ #include <sys/vmmeter.h> #include <sys/kernel.h> #include <sys/ktr.h> +#include <sys/mbuf.h> #include <sys/mutex.h> +#include <sys/socketvar.h> #include <sys/sysctl.h> #include <sys/unistd.h> @@ -78,8 +80,21 @@ #include <amd64/isa/isa.h> static void cpu_reset_real(void); +static void sf_buf_init(void *arg); +SYSINIT(sock_sf, SI_SUB_MBUF, SI_ORDER_ANY, sf_buf_init, NULL) /* + * Expanded sf_freelist head. Really an SLIST_HEAD() in disguise, with the + * sf_freelist head with the sf_lock mutex. + */ +static struct { + SLIST_HEAD(, sf_buf) sf_head; + struct mtx sf_lock; +} sf_freelist; + +static u_int sf_buf_alloc_want; + +/* * Finish a fork operation, with process p2 nearly set up. * Copy and update the pcb, set up the stack so that the child * ready to run and return to user mode. @@ -349,6 +364,86 @@ } /* + * Allocate a pool of sf_bufs (sendfile(2) or "super-fast" if you prefer. :-)) + */ +static void +sf_buf_init(void *arg) +{ + struct sf_buf *sf_bufs; + int i; + + mtx_init(&sf_freelist.sf_lock, "sf_bufs list lock", NULL, MTX_DEF); + mtx_lock(&sf_freelist.sf_lock); + SLIST_INIT(&sf_freelist.sf_head); + sf_bufs = malloc(nsfbufs * sizeof(struct sf_buf), M_TEMP, + M_NOWAIT | M_ZERO); + for (i = 0; i < nsfbufs; i++) + SLIST_INSERT_HEAD(&sf_freelist.sf_head, &sf_bufs[i], free_list); + sf_buf_alloc_want = 0; + mtx_unlock(&sf_freelist.sf_lock); +} + +/* + * Get an sf_buf from the freelist. Will block if none are available. + */ +struct sf_buf * +sf_buf_alloc(struct vm_page *m) +{ + struct sf_buf *sf; + int error; + + mtx_lock(&sf_freelist.sf_lock); + while ((sf = SLIST_FIRST(&sf_freelist.sf_head)) == NULL) { + sf_buf_alloc_want++; + error = msleep(&sf_freelist, &sf_freelist.sf_lock, PVM|PCATCH, + "sfbufa", 0); + sf_buf_alloc_want--; + + /* + * If we got a signal, don't risk going back to sleep. + */ + if (error) + break; + } + if (sf != NULL) { + SLIST_REMOVE_HEAD(&sf_freelist.sf_head, free_list); + sf->m = m; + sf->kva = PHYS_TO_DMAP(m->phys_addr); + } + mtx_unlock(&sf_freelist.sf_lock); + return (sf); +} + +/* + * Detatch mapped page and release resources back to the system. + */ +void +sf_buf_free(void *addr, void *args) +{ + struct sf_buf *sf; + struct vm_page *m; + + sf = args; + m = sf->m; + vm_page_lock_queues(); + vm_page_unwire(m, 0); + /* + * Check for the object going away on us. This can + * happen since we don't hold a reference to it. + * If so, we're responsible for freeing the page. + */ + if (m->wire_count == 0 && m->object == NULL) + vm_page_free(m); + vm_page_unlock_queues(); + sf->m = NULL; + mtx_lock(&sf_freelist.sf_lock); + SLIST_INSERT_HEAD(&sf_freelist.sf_head, sf, free_list); + if (sf_buf_alloc_want > 0) + wakeup_one(&sf_freelist); + mtx_unlock(&sf_freelist.sf_lock); +} + +/* * Software interrupt handler for queued VM system processing. */ void ==== //depot/projects/netperf/sys/amd64/include/varargs.h#2 (text+ko) ==== @@ -37,11 +37,11 @@ * SUCH DAMAGE. * * @(#)varargs.h 8.2 (Berkeley) 3/22/94 - * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.11 2002/10/06 22:02:06 mike Exp $ + * $FreeBSD: src/sys/amd64/include/varargs.h,v 1.12 2003/09/01 03:01:45 kan Exp $ */ -#ifndef _VARARGS_H_ -#define _VARARGS_H_ +#ifndef _MACHINE_VARARGS_H_ +#define _MACHINE_VARARGS_H_ #if defined(__GNUC__) && (__GNUC__ == 2 && __GNUC_MINOR__ > 95 || __GNUC__ >= 3) @@ -86,4 +86,4 @@ #endif /* __GNUC__ post GCC 2.95 */ -#endif /* !_VARARGS_H_ */ +#endif /* !_MACHINE_VARARGS_H_ */ ==== //depot/projects/netperf/sys/amd64/pci/pci_bus.c#4 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.101 2003/08/22 07:36:49 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_bus.c,v 1.102 2003/08/28 21:22:24 jhb Exp $"); #include "opt_cpu.h" @@ -328,10 +328,18 @@ for (slot = 0; slot <= PCI_SLOTMAX; slot++) { func = 0; hdrtype = nexus_pcib_read_config(0, bus, slot, func, - PCIR_HEADERTYPE, 1); + PCIR_HDRTYPE, 1); + /* + * When enumerating bus devices, the standard says that + * one should check the header type and ignore the slots whose + * header types that the software doesn't know about. We use + * this to filter out devices. + */ + if ((hdrtype & PCIM_HDRTYPE) > PCI_MAXHDRTYPE) + continue; if ((hdrtype & PCIM_MFDEV) && (!found_orion || hdrtype != 0xff)) - pcifunchigh = 7; + pcifunchigh = PCI_FUNCMAX; else pcifunchigh = 0; for (func = 0; func <= pcifunchigh; func++) { ==== //depot/projects/netperf/sys/boot/common/bcache.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/common/bcache.c,v 1.11 2002/02/25 03:45:09 bde Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/common/bcache.c,v 1.12 2003/08/25 23:30:41 obrien Exp $"); + /* * Simple LRU block cache */ ==== //depot/projects/netperf/sys/boot/common/boot.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/common/boot.c,v 1.28 2001/09/11 01:09:19 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/common/boot.c,v 1.29 2003/08/25 23:30:41 obrien Exp $"); + /* * Loading modules, booting the system */ ==== //depot/projects/netperf/sys/boot/common/commands.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/common/commands.c,v 1.18 2003/04/04 16:35:14 phk Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/common/commands.c,v 1.19 2003/08/25 23:30:41 obrien Exp $"); + #include <stand.h> #include <string.h> ==== //depot/projects/netperf/sys/boot/common/console.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/common/console.c,v 1.5 1999/08/28 00:39:46 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/common/console.c,v 1.6 2003/08/25 23:30:41 obrien Exp $"); + #include <stand.h> #include <string.h> ==== //depot/projects/netperf/sys/boot/common/dev_net.c#2 (text+ko) ==== @@ -1,6 +1,5 @@ /* - * $FreeBSD: src/sys/boot/common/dev_net.c,v 1.11 2002/07/31 20:17:06 jake Exp $ - * From: $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ + * $NetBSD: dev_net.c,v 1.12 1997/12/10 20:38:37 gwr Exp $ */ /*- @@ -39,7 +38,10 @@ * POSSIBILITY OF SUCH DAMAGE. */ -/* +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/common/dev_net.c,v 1.12 2003/08/25 23:30:41 obrien Exp $"); + +/*- * This module implements a "raw device" interface suitable for * use by the stand-alone I/O library NFS code. This interface * does not support any "block" access, and exists only for the ==== //depot/projects/netperf/sys/boot/common/devopen.c#2 (text+ko) ==== @@ -22,10 +22,10 @@ * 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/common/devopen.c,v 1.3 1999/08/28 00:39:47 peter Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/common/devopen.c,v 1.4 2003/08/25 23:30:41 obrien Exp $"); #include <stand.h> #include <string.h> ==== //depot/projects/netperf/sys/boot/common/interp.c#2 (text+ko) ==== @@ -22,9 +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/common/interp.c,v 1.28 2001/11/19 17:30:26 obrien Exp $ */ + +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/common/interp.c,v 1.29 2003/08/25 23:30:41 obrien Exp $"); + /* * Simple commandline interpreter, toplevel and misc. * ==== //depot/projects/netperf/sys/boot/common/interp_backslash.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -11,11 +11,12 @@ * Jordan K. Hubbard * 29 August 1998 * - * $FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.5 2000/08/03 09:13:54 jhb Exp $ - * * Routine for doing backslash elimination. */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/common/interp_backslash.c,v 1.6 2003/08/25 23:30:41 obrien Exp $"); + #include <stand.h> #include <string.h> #include "bootstrap.h" ==== //depot/projects/netperf/sys/boot/common/interp_forth.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* +/*- * Copyright (c) 1998 Michael Smith <msmith@freebsd.org> * All rights reserved. * @@ -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/common/interp_forth.c,v 1.22 2002/04/09 20:59:34 dcs Exp $ */ +#include <sys/cdefs.h> +__FBSDID("$FreeBSD: src/sys/boot/common/interp_forth.c,v 1.23 2003/08/25 23:30:41 obrien Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200309022353.h82NrduW025043>