From owner-p4-projects@FreeBSD.ORG Fri Aug 22 09:38:28 2003 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 953E516A4C1; Fri, 22 Aug 2003 09:38:27 -0700 (PDT) Delivered-To: perforce@freebsd.org Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 1F26616A4BF for ; Fri, 22 Aug 2003 09:38:27 -0700 (PDT) Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115]) by mx1.FreeBSD.org (Postfix) with ESMTP id 8131F43F75 for ; Fri, 22 Aug 2003 09:38:25 -0700 (PDT) (envelope-from sam@freebsd.org) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id h7MGcP0U024153 for ; Fri, 22 Aug 2003 09:38:25 -0700 (PDT) (envelope-from sam@freebsd.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.12.6/8.12.6/Submit) id h7MGcJkI024141 for perforce@freebsd.org; Fri, 22 Aug 2003 09:38:19 -0700 (PDT) Date: Fri, 22 Aug 2003 09:38:19 -0700 (PDT) Message-Id: <200308221638.h7MGcJkI024141@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to sam@freebsd.org using -f From: Sam Leffler To: Perforce Change Reviews Subject: PERFORCE change 36678 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.1 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Aug 2003 16:38:28 -0000 http://perforce.freebsd.org/chv.cgi?CH=36678 Change 36678 by sam@sam_ebb on 2003/08/22 09:37:24 IFC Affected files ... .. //depot/projects/netperf/sys/alpha/alpha/api_up1000.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/autoconf.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/busspace.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/db_disasm.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/db_interface.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_1000a.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_2100_a50.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_2100_a500.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_axppci_33.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_eb64plus.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_kn20aa.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_kn300.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_st550.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/dec_st6600.c#3 integrate .. //depot/projects/netperf/sys/alpha/alpha/dump_machdep.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/genassym.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/ieee_float.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/in_cksum.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/pmap.c#5 integrate .. //depot/projects/netperf/sys/alpha/alpha/promcons.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/sgmap.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/sys_machdep.c#2 integrate .. //depot/projects/netperf/sys/alpha/alpha/trap.c#2 integrate .. //depot/projects/netperf/sys/alpha/isa/isa.c#2 integrate .. //depot/projects/netperf/sys/alpha/isa/isa_dma.c#2 integrate .. //depot/projects/netperf/sys/alpha/isa/mcclock_isa.c#2 integrate .. //depot/projects/netperf/sys/alpha/linux/linux_dummy.c#2 integrate .. //depot/projects/netperf/sys/alpha/linux/linux_genassym.c#2 integrate .. //depot/projects/netperf/sys/alpha/linux/linux_machdep.c#2 integrate .. //depot/projects/netperf/sys/alpha/linux/linux_sysvec.c#2 integrate .. //depot/projects/netperf/sys/alpha/mcbus/mcmem.c#2 integrate .. //depot/projects/netperf/sys/alpha/mcbus/mcpcia.c#2 integrate .. //depot/projects/netperf/sys/alpha/osf1/imgact_osf1.c#2 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_ioctl.c#2 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_mount.c#2 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_signal.c#2 integrate .. //depot/projects/netperf/sys/alpha/osf1/osf1_sysvec.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/apecs_pci.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/bwx.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/cia_pci.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/irongate.c#3 integrate .. //depot/projects/netperf/sys/alpha/pci/irongate_pci.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/lca_pci.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/pcibus.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/swiz.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/t2.c#3 integrate .. //depot/projects/netperf/sys/alpha/pci/t2_pci.c#2 integrate .. //depot/projects/netperf/sys/alpha/pci/tsunami.c#3 integrate .. //depot/projects/netperf/sys/alpha/pci/tsunami_pci.c#2 integrate .. //depot/projects/netperf/sys/alpha/tlsb/dwlpx.c#2 integrate .. //depot/projects/netperf/sys/alpha/tlsb/gbus.c#2 integrate .. //depot/projects/netperf/sys/alpha/tlsb/kftxx.c#2 integrate .. //depot/projects/netperf/sys/alpha/tlsb/mcclock_tlsb.c#2 integrate .. //depot/projects/netperf/sys/alpha/tlsb/tlsbcpu.c#2 integrate .. //depot/projects/netperf/sys/alpha/tlsb/tlsbmem.c#2 integrate .. //depot/projects/netperf/sys/alpha/tlsb/zs_tlsb.c#2 integrate .. //depot/projects/netperf/sys/amd64/amd64/pmap.c#6 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_proto.h#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_syscall.h#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_syscalls.c#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/ia32_sysent.c#2 integrate .. //depot/projects/netperf/sys/amd64/ia32/syscalls.master#2 integrate .. //depot/projects/netperf/sys/amd64/pci/pci_bus.c#3 integrate .. //depot/projects/netperf/sys/boot/i386/boot2/boot1.s#2 integrate .. //depot/projects/netperf/sys/cam/scsi/scsi_da.c#6 integrate .. //depot/projects/netperf/sys/conf/NOTES#6 integrate .. //depot/projects/netperf/sys/conf/files#5 integrate .. //depot/projects/netperf/sys/conf/kern.pre.mk#4 integrate .. //depot/projects/netperf/sys/conf/kmod.mk#3 integrate .. //depot/projects/netperf/sys/conf/options#7 integrate .. //depot/projects/netperf/sys/contrib/dev/oltr/if_oltr.c#3 integrate .. //depot/projects/netperf/sys/dev/aac/aac.c#2 integrate .. //depot/projects/netperf/sys/dev/aac/aac_cam.c#2 integrate .. //depot/projects/netperf/sys/dev/aac/aac_disk.c#2 integrate .. //depot/projects/netperf/sys/dev/aac/aac_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_pcib.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_pcib_acpi.c#3 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_pcib_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/acpica/acpi_timer.c#3 integrate .. //depot/projects/netperf/sys/dev/adlink/adlink.c#2 integrate .. //depot/projects/netperf/sys/dev/advansys/adv_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/advansys/adw_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/aic/aic.c#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate .. //depot/projects/netperf/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate .. //depot/projects/netperf/sys/dev/amd/amd.c#4 integrate .. //depot/projects/netperf/sys/dev/amr/amr.c#2 integrate .. //depot/projects/netperf/sys/dev/amr/amr_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/an/if_aironet_ieee.h#2 integrate .. //depot/projects/netperf/sys/dev/an/if_an.c#2 integrate .. //depot/projects/netperf/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/netperf/sys/dev/ar/if_ar_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/asr/asr.c#2 integrate .. //depot/projects/netperf/sys/dev/ata/ata-chipset.c#2 integrate .. //depot/projects/netperf/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/netperf/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/netperf/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/netperf/sys/dev/ath/if_athioctl.h#4 integrate .. //depot/projects/netperf/sys/dev/ath/if_athvar.h#3 integrate .. //depot/projects/netperf/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/netperf/sys/dev/bge/if_bgereg.h#4 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_audio.c#3 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_card.c#2 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_core.c#4 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_os.c#3 integrate .. //depot/projects/netperf/sys/dev/bktr/bktr_tuner.c#2 integrate .. //depot/projects/netperf/sys/dev/buslogic/bt_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/ciss/ciss.c#3 integrate .. //depot/projects/netperf/sys/dev/digi/digi_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/dpt/dpt_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/drm/drm_os_freebsd.h#3 integrate .. //depot/projects/netperf/sys/dev/ed/if_ed_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/em/if_em.h#4 integrate .. //depot/projects/netperf/sys/dev/em/if_em_osdep.h#3 integrate .. //depot/projects/netperf/sys/dev/en/if_en_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/fatm/if_fatm.c#5 integrate .. //depot/projects/netperf/sys/dev/fb/boot_font.c#2 integrate .. //depot/projects/netperf/sys/dev/fb/gfb.c#2 integrate .. //depot/projects/netperf/sys/dev/fb/s3_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/fb/tga.c#2 integrate .. //depot/projects/netperf/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/netperf/sys/dev/firewire/fwcrom.c#2 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci.c#5 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/netperf/sys/dev/firewire/fwohcireg.h#3 integrate .. //depot/projects/netperf/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/netperf/sys/dev/fxp/if_fxp.c#6 integrate .. //depot/projects/netperf/sys/dev/gfb/gfb_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/gx/if_gx.c#2 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm.c#4 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_intr.c#2 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_ioctl.c#5 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_rx.c#3 integrate .. //depot/projects/netperf/sys/dev/hatm/if_hatm_tx.c#5 integrate .. //depot/projects/netperf/sys/dev/hea/eni.h#2 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_buffer.c#2 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_command.c#3 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_globals.c#2 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_if.c#3 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_init.c#3 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_intr.c#3 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_load.c#2 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_output.c#3 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_receive.c#2 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_stats.c#2 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_timer.c#2 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_transmit.c#2 integrate .. //depot/projects/netperf/sys/dev/hfa/fore_vcm.c#3 integrate .. //depot/projects/netperf/sys/dev/hifn/hifn7751.c#4 integrate .. //depot/projects/netperf/sys/dev/hme/if_hme_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/ida/ida_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/iir/iir_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/ips/ips.h#2 integrate .. //depot/projects/netperf/sys/dev/ips/ips_disk.h#2 integrate .. //depot/projects/netperf/sys/dev/isp/isp_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/lge/if_lge.c#2 integrate .. //depot/projects/netperf/sys/dev/lmc/if_lmc.c#2 integrate .. //depot/projects/netperf/sys/dev/lnc/if_lnc_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/mii/brgphy.c#3 integrate .. //depot/projects/netperf/sys/dev/mii/dcphy.c#2 integrate .. //depot/projects/netperf/sys/dev/mlx/mlx_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/mly/mly.c#3 integrate .. //depot/projects/netperf/sys/dev/mpt/mpt_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/netperf/sys/dev/my/if_my.c#2 integrate .. //depot/projects/netperf/sys/dev/nge/if_nge.c#2 integrate .. //depot/projects/netperf/sys/dev/patm/if_patm_attach.c#3 integrate .. //depot/projects/netperf/sys/dev/pccard/pccard.c#2 integrate .. //depot/projects/netperf/sys/dev/pccard/pccard_cis.c#3 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs#5 integrate .. //depot/projects/netperf/sys/dev/pccard/pccarddevs.h#5 integrate .. //depot/projects/netperf/sys/dev/pccbb/pccbb.c#5 integrate .. //depot/projects/netperf/sys/dev/pccbb/pccbbdevid.h#2 integrate .. //depot/projects/netperf/sys/dev/pci/eisa_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/pci/fixup_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/pci/ignore_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/pci/isa_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/pci/pci.c#3 integrate .. //depot/projects/netperf/sys/dev/pci/pci_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/netperf/sys/dev/pci/pci_user.c#2 integrate .. //depot/projects/netperf/sys/dev/pci/pcib_private.h#2 integrate .. //depot/projects/netperf/sys/dev/pci/pcivar.h#2 integrate .. //depot/projects/netperf/sys/dev/ppbus/ppb_base.c#2 integrate .. //depot/projects/netperf/sys/dev/pst/pst-iop.c#2 integrate .. //depot/projects/netperf/sys/dev/pst/pst-pci.c#2 integrate .. //depot/projects/netperf/sys/dev/pst/pst-raid.c#2 integrate .. //depot/projects/netperf/sys/dev/puc/pucdata.c#4 integrate .. //depot/projects/netperf/sys/dev/rndtest/rndtest.c#3 integrate .. //depot/projects/netperf/sys/dev/rp/rp_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/safe/safe.c#4 integrate .. //depot/projects/netperf/sys/dev/sbni/if_sbni_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/sbsh/if_sbsh.c#2 integrate .. //depot/projects/netperf/sys/dev/si/si_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/sio/sio_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/sn/if_sn_pccard.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/als4000.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/au88x0.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/aureal.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/cmi.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/cs4281.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csa.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csamidi.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/csapcm.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ds1.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/es137x.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/fm801.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/ich.c#3 integrate .. //depot/projects/netperf/sys/dev/sound/pci/maestro.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/maestro3.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/neomagic.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/solo.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/t4dwave.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/via8233.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/via82c686.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pci/vibes.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/ac97.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/ac97.h#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/ac97_patch.c#2 integrate .. //depot/projects/netperf/sys/dev/sound/pcm/ac97_patch.h#2 integrate .. //depot/projects/netperf/sys/dev/sr/if_sr_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/stg/tmc18c30_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/netperf/sys/dev/tdfx/tdfx_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/trm/trm.c#4 integrate .. //depot/projects/netperf/sys/dev/twe/twe_compat.h#4 integrate .. //depot/projects/netperf/sys/dev/tx/if_tx.c#3 integrate .. //depot/projects/netperf/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/netperf/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/netperf/sys/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/usb/umass.c#4 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs#2 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs.h#2 integrate .. //depot/projects/netperf/sys/dev/usb/usbdevs_data.h#2 integrate .. //depot/projects/netperf/sys/dev/vx/if_vx_pci.c#2 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi.c#6 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi_pccard.c#4 integrate .. //depot/projects/netperf/sys/dev/wi/if_wi_pci.c#5 integrate .. //depot/projects/netperf/sys/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/netperf/sys/geom/geom_ccd.c#3 integrate .. //depot/projects/netperf/sys/geom/geom_subr.c#2 integrate .. //depot/projects/netperf/sys/i386/i386/pmap.c#6 integrate .. //depot/projects/netperf/sys/i386/pci/pci_bus.c#3 integrate .. //depot/projects/netperf/sys/i4b/capi/iavc/iavc_pci.c#2 integrate .. //depot/projects/netperf/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate .. //depot/projects/netperf/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate .. //depot/projects/netperf/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate .. //depot/projects/netperf/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate .. //depot/projects/netperf/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia32/ia32_proto.h#2 integrate .. //depot/projects/netperf/sys/ia64/ia32/ia32_syscall.h#2 integrate .. //depot/projects/netperf/sys/ia64/ia32/ia32_sysent.c#2 integrate .. //depot/projects/netperf/sys/ia64/ia32/syscalls.master#2 integrate .. //depot/projects/netperf/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/netperf/sys/ia64/include/cpu.h#6 integrate .. //depot/projects/netperf/sys/kern/init_main.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_fork.c#5 integrate .. //depot/projects/netperf/sys/kern/kern_mac.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_mib.c#2 integrate .. //depot/projects/netperf/sys/kern/kern_synch.c#4 integrate .. //depot/projects/netperf/sys/kern/kern_tc.c#3 integrate .. //depot/projects/netperf/sys/kern/kern_thread.c#5 integrate .. //depot/projects/netperf/sys/kern/sched_4bsd.c#4 integrate .. //depot/projects/netperf/sys/kern/sched_ule.c#3 integrate .. //depot/projects/netperf/sys/kern/vfs_syscalls.c#6 integrate .. //depot/projects/netperf/sys/modules/Makefile#3 integrate .. //depot/projects/netperf/sys/modules/mac_stub/Makefile#1 branch .. //depot/projects/netperf/sys/net/bpf.c#4 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_input.c#5 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_node.h#5 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_output.c#3 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/netperf/sys/net80211/ieee80211_var.h#3 integrate .. //depot/projects/netperf/sys/netgraph/ng_ksocket.c#2 integrate .. //depot/projects/netperf/sys/netinet/igmp.c#2 integrate .. //depot/projects/netperf/sys/netinet/in.h#3 integrate .. //depot/projects/netperf/sys/netinet/in_pcb.h#3 integrate .. //depot/projects/netperf/sys/netinet/in_var.h#2 integrate .. //depot/projects/netperf/sys/netinet/ip_icmp.c#3 integrate .. //depot/projects/netperf/sys/netinet/ip_output.c#3 integrate .. //depot/projects/netperf/sys/netinet/ip_var.h#3 integrate .. //depot/projects/netperf/sys/netinet/raw_ip.c#4 integrate .. //depot/projects/netperf/sys/netinet/tcp_subr.c#2 integrate .. //depot/projects/netperf/sys/netinet/tcp_syncache.c#4 integrate .. //depot/projects/netperf/sys/netinet/udp_usrreq.c#4 integrate .. //depot/projects/netperf/sys/pci/agp.c#2 integrate .. //depot/projects/netperf/sys/pci/agp_ali.c#2 integrate .. //depot/projects/netperf/sys/pci/agp_amd.c#2 integrate .. //depot/projects/netperf/sys/pci/agp_i810.c#2 integrate .. //depot/projects/netperf/sys/pci/agp_intel.c#2 integrate .. //depot/projects/netperf/sys/pci/agp_sis.c#2 integrate .. //depot/projects/netperf/sys/pci/agp_via.c#2 integrate .. //depot/projects/netperf/sys/pci/alpm.c#2 integrate .. //depot/projects/netperf/sys/pci/amdpm.c#2 integrate .. //depot/projects/netperf/sys/pci/if_dc.c#3 integrate .. //depot/projects/netperf/sys/pci/if_de.c#2 integrate .. //depot/projects/netperf/sys/pci/if_mn.c#2 integrate .. //depot/projects/netperf/sys/pci/if_pcn.c#2 integrate .. //depot/projects/netperf/sys/pci/if_rl.c#5 integrate .. //depot/projects/netperf/sys/pci/if_sf.c#2 integrate .. //depot/projects/netperf/sys/pci/if_sis.c#8 integrate .. //depot/projects/netperf/sys/pci/if_sk.c#2 integrate .. //depot/projects/netperf/sys/pci/if_ste.c#2 integrate .. //depot/projects/netperf/sys/pci/if_ti.c#3 integrate .. //depot/projects/netperf/sys/pci/if_tl.c#2 integrate .. //depot/projects/netperf/sys/pci/if_vr.c#2 integrate .. //depot/projects/netperf/sys/pci/if_wb.c#2 integrate .. //depot/projects/netperf/sys/pci/if_xl.c#3 integrate .. //depot/projects/netperf/sys/pci/intpm.c#2 integrate .. //depot/projects/netperf/sys/pci/meteor.c#3 integrate .. //depot/projects/netperf/sys/pci/ncr.c#3 integrate .. //depot/projects/netperf/sys/pci/viapm.c#2 integrate .. //depot/projects/netperf/sys/pci/xrpu.c#2 integrate .. //depot/projects/netperf/sys/powerpc/ofw/ofw_pcib_pci.c#2 integrate .. //depot/projects/netperf/sys/security/mac_biba/mac_biba.c#3 integrate .. //depot/projects/netperf/sys/security/mac_bsdextended/mac_bsdextended.c#2 integrate .. //depot/projects/netperf/sys/security/mac_lomac/mac_lomac.c#2 integrate .. //depot/projects/netperf/sys/security/mac_mls/mac_mls.c#3 integrate .. //depot/projects/netperf/sys/security/mac_none/mac_none.c#2 integrate .. //depot/projects/netperf/sys/security/mac_stub/mac_stub.c#1 branch .. //depot/projects/netperf/sys/security/mac_test/mac_test.c#2 integrate .. //depot/projects/netperf/sys/sparc64/conf/GENERIC#2 integrate .. //depot/projects/netperf/sys/sparc64/ebus/ebus.c#2 integrate .. //depot/projects/netperf/sys/sparc64/isa/isa.c#2 integrate .. //depot/projects/netperf/sys/sparc64/isa/ofw_isa.c#2 integrate .. //depot/projects/netperf/sys/sparc64/pci/apb.c#2 integrate .. //depot/projects/netperf/sys/sparc64/pci/ofw_pci.c#2 integrate .. //depot/projects/netperf/sys/sparc64/pci/ofw_pcib.c#2 integrate .. //depot/projects/netperf/sys/sparc64/pci/ofw_pcib_subr.c#2 integrate .. //depot/projects/netperf/sys/sparc64/pci/ofw_pcibus.c#2 integrate .. //depot/projects/netperf/sys/sparc64/pci/psycho.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sbus/sbus.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/cache.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/cheetah.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/db_hwwatch.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/dump_machdep.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/identcpu.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/intr_machdep.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/mem.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/mp_machdep.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/nexus.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/ofw_bus.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/pmap.c#4 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/spitfire.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/sys_machdep.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/tick.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/tlb.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/trap.c#2 integrate .. //depot/projects/netperf/sys/sparc64/sparc64/tsb.c#2 integrate .. //depot/projects/netperf/sys/sys/mac.h#2 integrate .. //depot/projects/netperf/sys/sys/mac_policy.h#2 integrate .. //depot/projects/netperf/sys/sys/sysctl.h#2 integrate .. //depot/projects/netperf/sys/vm/uma_core.c#6 integrate .. //depot/projects/netperf/sys/vm/vm_page.c#2 integrate Differences ... ==== //depot/projects/netperf/sys/alpha/alpha/api_up1000.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.8 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/api_up1000.c,v 1.9 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/netperf/sys/alpha/alpha/autoconf.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.56 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.57 2003/08/22 07:20:25 imp Exp $"); #include "opt_bootp.h" #include "opt_isa.h" ==== //depot/projects/netperf/sys/alpha/alpha/busspace.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/busspace.c,v 1.3 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/busspace.c,v 1.4 2003/08/22 07:20:25 imp Exp $"); #include /* RCS ID & Copyright macro defns */ ==== //depot/projects/netperf/sys/alpha/alpha/db_disasm.c#2 (text+ko) ==== @@ -46,7 +46,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_disasm.c,v 1.4 1997/09/16 22:52:40 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.8 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_disasm.c,v 1.9 2003/08/22 07:20:25 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/alpha/db_interface.c#2 (text+ko) ==== @@ -47,7 +47,7 @@ #include /* RCS ID & Copyright macro defns */ /* __KERNEL_RCSID(0, "$NetBSD: db_interface.c,v 1.2 1997/09/16 19:07:19 thorpej Exp $"); */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.27 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/db_interface.c,v 1.28 2003/08/22 07:20:25 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/alpha/dec_1000a.c#3 (text+ko) ==== @@ -72,7 +72,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.15 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_1000a.c,v 1.16 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -92,7 +92,7 @@ #include #include -#include +#include #ifndef CONSPEED #define CONSPEED TTYDEF_SPEED ==== //depot/projects/netperf/sys/alpha/alpha/dec_2100_a50.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.16 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a50.c,v 1.17 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -49,8 +49,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/netperf/sys/alpha/alpha/dec_2100_a500.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.15 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_2100_a500.c,v 1.16 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -42,8 +42,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/netperf/sys/alpha/alpha/dec_axppci_33.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.19 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_axppci_33.c,v 1.20 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -47,8 +47,8 @@ #include #include -#include -#include +#include +#include #include #ifndef CONSPEED ==== //depot/projects/netperf/sys/alpha/alpha/dec_eb64plus.c#3 (text+ko) ==== @@ -46,7 +46,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.14 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_eb64plus.c,v 1.15 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -62,8 +62,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/netperf/sys/alpha/alpha/dec_kn20aa.c#3 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.16 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn20aa.c,v 1.17 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -46,8 +46,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/netperf/sys/alpha/alpha/dec_kn300.c#3 (text+ko) ==== @@ -29,7 +29,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.11 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_kn300.c,v 1.12 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -48,8 +48,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/netperf/sys/alpha/alpha/dec_st550.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.14 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st550.c,v 1.15 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -51,8 +51,8 @@ #include #include -#include -#include +#include +#include #include #include ==== //depot/projects/netperf/sys/alpha/alpha/dec_st6600.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.15 2003/08/17 06:42:07 marcel Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dec_st6600.c,v 1.16 2003/08/22 07:20:25 imp Exp $"); #include "opt_ddb.h" #include "opt_dev_sc.h" @@ -44,8 +44,8 @@ #include #include -#include -#include +#include +#include #include #ifndef CONSPEED ==== //depot/projects/netperf/sys/alpha/alpha/dump_machdep.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.4 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/dump_machdep.c,v 1.5 2003/08/22 07:20:25 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/alpha/genassym.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.42 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/genassym.c,v 1.43 2003/08/22 07:20:25 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/alpha/ieee_float.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.8 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/ieee_float.c,v 1.9 2003/08/22 07:20:25 imp Exp $"); #include #ifdef TEST ==== //depot/projects/netperf/sys/alpha/alpha/in_cksum.c#2 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include /* RCS ID & Copyright macro defns */ -__FBSDID("$FreeBSD: src/sys/alpha/alpha/in_cksum.c,v 1.7 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/in_cksum.c,v 1.8 2003/08/22 07:20:25 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/alpha/pmap.c#5 (text+ko) ==== @@ -148,7 +148,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.133 2003/08/07 18:35:16 gallatin Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.134 2003/08/20 20:12:05 alc Exp $"); #include #include @@ -1076,6 +1076,7 @@ /* * allocate the page directory page */ + VM_OBJECT_LOCK(pmap->pm_pteobj); lev1pg = vm_page_grab(pmap->pm_pteobj, NUSERLEV3MAPS + NUSERLEV2MAPS, VM_ALLOC_NORMAL | VM_ALLOC_RETRY | VM_ALLOC_WIRED); @@ -1083,6 +1084,7 @@ vm_page_flag_clear(lev1pg, PG_BUSY); lev1pg->valid = VM_PAGE_BITS_ALL; vm_page_unlock_queues(); + VM_OBJECT_UNLOCK(pmap->pm_pteobj); pmap->pm_lev1 = (pt_entry_t*) ALPHA_PHYS_TO_K0SEG(VM_PAGE_TO_PHYS(lev1pg)); if ((lev1pg->flags & PG_ZERO) == 0) @@ -1199,12 +1201,17 @@ pt_entry_t* pte; vm_offset_t ptepa; vm_page_t m; + int is_object_locked; /* * Find or fabricate a new pagetable page */ + if (!(is_object_locked = VM_OBJECT_LOCKED(pmap->pm_pteobj))) + VM_OBJECT_LOCK(pmap->pm_pteobj); m = vm_page_grab(pmap->pm_pteobj, ptepindex, VM_ALLOC_WIRED | VM_ALLOC_ZERO | VM_ALLOC_RETRY); + if ((m->flags & PG_ZERO) == 0) + pmap_zero_page(m); KASSERT(m->queue == PQ_NONE, ("_pmap_allocpte: %p->queue != PQ_NONE", m)); @@ -1249,14 +1256,13 @@ */ pmap->pm_ptphint = m; - if ((m->flags & PG_ZERO) == 0) - bzero((caddr_t) ALPHA_PHYS_TO_K0SEG(ptepa), PAGE_SIZE); - vm_page_lock_queues(); m->valid = VM_PAGE_BITS_ALL; vm_page_flag_clear(m, PG_ZERO); vm_page_wakeup(m); vm_page_unlock_queues(); + if (!is_object_locked) + VM_OBJECT_UNLOCK(pmap->pm_pteobj); return m; } ==== //depot/projects/netperf/sys/alpha/alpha/promcons.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.29 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.30 2003/08/22 07:20:25 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/alpha/sgmap.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.5 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sgmap.c,v 1.6 2003/08/22 07:20:25 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/alpha/sys_machdep.c#2 (text+ko) ==== @@ -34,7 +34,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.25 2003/06/10 16:50:43 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/sys_machdep.c,v 1.26 2003/08/22 07:20:25 imp Exp $"); #include "opt_mac.h" ==== //depot/projects/netperf/sys/alpha/alpha/trap.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.115 2003/06/15 00:31:21 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/alpha/trap.c,v 1.116 2003/08/22 07:20:25 imp Exp $"); /* #include "opt_fix_unaligned_vax_fp.h" */ #include "opt_ddb.h" ==== //depot/projects/netperf/sys/alpha/isa/isa.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.32 2003/06/10 16:57:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.33 2003/08/22 07:20:26 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/isa/isa_dma.c#2 (text+ko) ==== @@ -48,7 +48,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.9 2003/07/01 15:51:50 scottl Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/isa_dma.c,v 1.10 2003/08/22 07:20:26 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/isa/mcclock_isa.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/isa/mcclock_isa.c,v 1.9 2003/06/10 16:57:28 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/isa/mcclock_isa.c,v 1.10 2003/08/22 07:20:26 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/linux/linux_dummy.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.36 2003/06/10 17:00:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_dummy.c,v 1.37 2003/08/22 07:20:26 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/linux/linux_genassym.c#2 (text+ko) ==== @@ -1,5 +1,5 @@ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_genassym.c,v 1.18 2003/06/10 17:00:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_genassym.c,v 1.19 2003/08/22 07:20:26 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/linux/linux_machdep.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.31 2003/06/10 17:00:35 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_machdep.c,v 1.32 2003/08/22 07:20:26 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/linux/linux_sysvec.c#2 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.89 2003/06/15 00:31:22 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/linux/linux_sysvec.c,v 1.90 2003/08/22 07:20:26 imp Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/netperf/sys/alpha/mcbus/mcmem.c#2 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcmem.c,v 1.2 2003/06/10 17:02:51 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcmem.c,v 1.3 2003/08/22 07:20:26 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/mcbus/mcpcia.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.26 2003/06/28 13:47:23 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/mcbus/mcpcia.c,v 1.27 2003/08/22 07:20:26 imp Exp $"); #include #include @@ -58,8 +58,8 @@ #include #include #include -#include -#include +#include +#include #include "alphapci_if.h" #include "pcib_if.h" ==== //depot/projects/netperf/sys/alpha/osf1/imgact_osf1.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.19 2003/06/10 17:10:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/imgact_osf1.c,v 1.20 2003/08/22 07:20:27 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/osf1/osf1_ioctl.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.9 2003/06/10 17:10:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_ioctl.c,v 1.10 2003/08/22 07:20:27 imp Exp $"); #include #include ==== //depot/projects/netperf/sys/alpha/osf1/osf1_mount.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.16 2003/06/22 08:41:41 phk Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_mount.c,v 1.17 2003/08/22 07:20:27 imp Exp $"); #include "opt_mac.h" #include "opt_nfs.h" ==== //depot/projects/netperf/sys/alpha/osf1/osf1_signal.c#2 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.34 2003/06/10 17:10:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_signal.c,v 1.35 2003/08/22 07:20:27 imp Exp $"); #include "opt_compat.h" #ifndef COMPAT_43 ==== //depot/projects/netperf/sys/alpha/osf1/osf1_sysvec.c#2 (text+ko) ==== @@ -30,7 +30,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.9 2003/06/10 17:10:18 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_sysvec.c,v 1.10 2003/08/22 07:20:27 imp Exp $"); /* XXX we use functions that might not exist. */ #include "opt_compat.h" ==== //depot/projects/netperf/sys/alpha/pci/apecs_pci.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.14 2003/06/10 17:27:48 obrien Exp $"); +__FBSDID("$FreeBSD: src/sys/alpha/pci/apecs_pci.c,v 1.15 2003/08/22 07:20:27 imp Exp $"); #include #include @@ -34,8 +34,8 @@ #include #include #include -#include >>> TRUNCATED FOR MAIL (1000 lines) <<<