PERFORCE change 49219 for review
Robert Watson
rwatson at FreeBSD.org
Wed Mar 17 17:13:38 PST 2004
http://perforce.freebsd.org/chv.cgi?CH=49219
Change 49219 by rwatson at rwatson_paprika on 2004/03/17 17:13:20
sf_buf_free() reformulated.
Giant substantially pushed down in wait() and various wait()-like
ABIs; those ABI pieces now consume kern_exit().
bus_alloc_resource_any() API added.
nmount() used from various ABI mount() variations.
RaidFrame GC'd.
arl wireless driver.
pf ifdef and hook rearrangement.
ata device removal tweaks, etc.
GDB_AUTO_ENTER.
security.jail.list_allowed removed.
ps_argsopen bug fix.
Additional vslock() related cleanup
ptrace() proc locking fixed.
sysv_sem() bug fixes.
Giant pushed down in open().
More isa compat shim removal.
Loop back if_tap softc locking.
Loopback of if_tun's tun_proc to tun_pid conversion.
Loopback staticizing netatalk bits.
NFS "EPIPE" fix for TCP.
Affected files ...
.. //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/isa/isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_proto.h#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_syscall.h#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysent.c#3 integrate
.. //depot/projects/netperf_socket/sys/alpha/osf1/syscalls.master#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#3 integrate
.. //depot/projects/netperf_socket/sys/amd64/isa/isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#3 integrate
.. //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#2 integrate
.. //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#3 integrate
.. //depot/projects/netperf_socket/sys/compat/ndis/subr_ntoskrnl.c#6 integrate
.. //depot/projects/netperf_socket/sys/compat/svr4/svr4_misc.c#3 integrate
.. //depot/projects/netperf_socket/sys/conf/NOTES#7 integrate
.. //depot/projects/netperf_socket/sys/conf/files#9 integrate
.. //depot/projects/netperf_socket/sys/conf/files.i386#8 integrate
.. //depot/projects/netperf_socket/sys/conf/options#5 integrate
.. //depot/projects/netperf_socket/sys/contrib/dev/oltr/if_oltr.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pflog.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/if_pfsync.h#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_ioctl.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_norm.c#3 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_osfp.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/netperf_socket/sys/contrib/pf/net/pfvar.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aac/aac_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi.c#6 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_cpu.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_ec.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_resource.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/acpica/acpi_timer.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/adlink/adlink.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/advansys/adv_eisa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/advansys/adv_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/advansys/adv_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/advansys/adw_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aha/aha_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aha/aha_mca.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ahb/ahb.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic/aic_cbus.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic/aic_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic/aic_pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_eisa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahc_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/aic7xxx/ahd_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/amd/amd.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/amr/amr_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ar/if_ar.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/arl/if_arl.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/arl/if_arl_isa.c#1 branch
.. //depot/projects/netperf_socket/sys/dev/arl/if_arlreg.h#1 branch
.. //depot/projects/netperf_socket/sys/dev/asr/asr.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-all.h#6 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-cbus.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-chipset.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-lowlevel.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-pci.h#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ata/ata-queue.c#5 integrate
.. //depot/projects/netperf_socket/sys/dev/ath/if_ath_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/awi/if_awi_pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/bfe/if_bfe.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/bge/if_bge.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/bktr/bktr_os.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/buslogic/bt_eisa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/buslogic/bt_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/buslogic/bt_mca.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/buslogic/bt_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/cardbus/cardbus_cis.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ciss/ciss.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/cm/smc90cx6.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/cnw/if_cnw.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/cs/if_cs.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ct/ct_isa.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/digi/digi_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/dpt/dpt_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/dpt/dpt_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/dpt/dpt_scsi.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/drm/drm_irq.h#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ed/if_ed.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/em/if_em.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/en/if_en_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ep/if_ep.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/ep/if_ep_eisa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ex/if_ex.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/fb/s3_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/fe/if_fe.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/firewire/fwohci_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/fxp/if_fxp.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/gem/if_gem_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/gfb/gfb_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/gx/if_gx.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/hatm/if_hatm.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/hfa/hfa_freebsd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hifn/hifn7751.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ida/ida_eisa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ida/ida_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/idt/idt_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ie/if_ie.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/if_ndis/if_ndis_pci.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/iir/iir_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ips/ips_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/isp_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/isp/isp_sbus.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/joy/joy.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/lge/if_lge.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_cbus.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/lnc/if_lnc_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/matcd/matcd_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mcd/mcd_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mlx/mlx.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/mlx/mlx_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/mly/mly.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/mpt/mpt_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/musycc/musycc.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/my/if_my.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/ncv/ncr53c500_pccard.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/nge/if_nge.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/nsp/nsp_pccard.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/owi/if_owi.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/patm/if_patm_attach.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/pccard/pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pccbb/pccbb.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/pci/isa_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pcic/i82365.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pcic/i82365_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pdq/if_fea.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pdq/if_fpa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ppc/ppc.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/pst/pst-pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/puc/puc.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_acctrace.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_acctrace.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_alloclist.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_alloclist.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_archs.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_aselect.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_aselect.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_bsd.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_callback.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_callback.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_chaindecluster.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_chaindecluster.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_configure.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_copyback.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_copyback.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_cvscan.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_cvscan.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dag.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagdegrd.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagdegrd.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagdegwr.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagdegwr.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagffrd.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagffrd.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagffwr.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagffwr.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagflags.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagfuncs.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagfuncs.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagutils.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_dagutils.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_debugMem.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_debugMem.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_debugprint.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_debugprint.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_decluster.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_decluster.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_declusterPQ.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_declusterPQ.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_desc.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_diskqueue.c#3 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_diskqueue.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_disks.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_disks.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_driver.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_driver.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_engine.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_engine.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_etimer.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd_dagfuncs.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd_dagfuncs.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd_dags.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_evenodd_dags.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_fifo.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_fifo.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_freebsdkintf.c#3 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_freelist.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_general.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_geniq.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_hist.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_interdecluster.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_interdecluster.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_invertq.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_invertq.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_kintf.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_layout.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_layout.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_map.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_map.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_mcpair.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_mcpair.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_memchunk.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_memchunk.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_nwayxor.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_nwayxor.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_options.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_options.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_optnames.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylog.c#3 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylog.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylogDiskMgr.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylogDiskMgr.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylogging.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_paritylogging.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_parityloggingdags.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_parityloggingdags.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_parityscan.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_parityscan.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pq.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pq.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pqdeg.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pqdeg.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pqdegdags.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_pqdegdags.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_psstatus.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_psstatus.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid0.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid0.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid1.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid1.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid4.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid4.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid5.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid5.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid5_rotatedspare.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raid5_rotatedspare.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_raidframe.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconbuffer.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconbuffer.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconmap.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconmap.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconstruct.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconstruct.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconutil.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_reconutil.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_revent.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_revent.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_shutdown.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_shutdown.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_sstf.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_sstf.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_states.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_states.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_stripelocks.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_stripelocks.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_strutils.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_threadstuff.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_threadstuff.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_types.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_utils.c#2 delete
.. //depot/projects/netperf_socket/sys/dev/raidframe/rf_utils.h#2 delete
.. //depot/projects/netperf_socket/sys/dev/ray/if_ray.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/rc/rc.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/re/if_re.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/rp/rp_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sab/sab.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/safe/safe.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sbni/if_sbni_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sbni/if_sbni_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sbsh/if_sbsh.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/scd/scd_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/si/si_eisa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/si/si_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/si/si_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sio/sio.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sn/if_sn.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/snc/if_snc.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/ad1816.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/ess.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/gusc.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/gusmidi.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/mpu.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/mss.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/sb16.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/sb8.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/sbc.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/isa/uartsio.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/als4000.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/au88x0.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/aureal.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/cmi.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/cs4281.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/csa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/csamidi.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/csapcm.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/ds1.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/emu10k1.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/es137x.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/fm801.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/ich.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/maestro3.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/neomagic.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/solo.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/t4dwave.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/via8233.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sound/pci/via82c686.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/sr/if_sr.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/stg/tmc18c30_subr.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/sym/sym_hipd.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/tdfx/tdfx_pci.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/trm/trm.c#4 integrate
.. //depot/projects/netperf_socket/sys/dev/twe/twe_freebsd.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/tx/if_tx.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/txp/if_txp.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/ubsec/ubsec.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/ohci_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/vx/if_vx_eisa.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/wi/if_wi_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/wl/if_wl.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/xe/if_xe.c#3 integrate
.. //depot/projects/netperf_socket/sys/dev/zs/zs_macio.c#2 integrate
.. //depot/projects/netperf_socket/sys/dev/zs/zs_sbus.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/bios/smapi.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/bios/smbios.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/bios/vpd.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/conf/NOTES#12 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/elan-mmcr.c#5 integrate
.. //depot/projects/netperf_socket/sys/i386/i386/vm_machdep.c#6 integrate
.. //depot/projects/netperf_socket/sys/i386/ibcs2/ibcs2_misc.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/atpic.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/if_el.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/mse.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/isa/spic.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/linux_proto.h#3 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/linux_syscall.h#3 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/linux_sysent.c#3 integrate
.. //depot/projects/netperf_socket/sys/i386/linux/syscalls.master#3 integrate
.. //depot/projects/netperf_socket/sys/i4b/capi/iavc/iavc_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/capi/iavc/iavc_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_ctx_s0P.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_drn_ngo.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/ia64/vm_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/ia64/isa/isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/isa/atkbd_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/isa/atkbdc_isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/isa/fd.c#4 integrate
.. //depot/projects/netperf_socket/sys/isa/isa_common.c#2 integrate
.. //depot/projects/netperf_socket/sys/isa/orm.c#2 integrate
.. //depot/projects/netperf_socket/sys/isa/psm.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/init_sysent.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_exit.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_jail.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_proc.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/kern_sysctl.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/subr_smp.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/sys_process.c#3 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/syscalls.master#4 integrate
.. //depot/projects/netperf_socket/sys/kern/sysv_sem.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_cow.c#2 integrate
.. //depot/projects/netperf_socket/sys/kern/uipc_syscalls.c#5 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_mount.c#4 integrate
.. //depot/projects/netperf_socket/sys/kern/vfs_syscalls.c#4 integrate
.. //depot/projects/netperf_socket/sys/modules/Makefile#5 integrate
.. //depot/projects/netperf_socket/sys/modules/arl/Makefile#1 branch
.. //depot/projects/netperf_socket/sys/modules/i2c/controllers/pcf/Makefile#2 integrate
.. //depot/projects/netperf_socket/sys/modules/raidframe/Makefile#2 delete
.. //depot/projects/netperf_socket/sys/net/if_tap.c#5 integrate
.. //depot/projects/netperf_socket/sys/net/if_tapvar.h#4 integrate
.. //depot/projects/netperf_socket/sys/net/if_tun.c#5 integrate
.. //depot/projects/netperf_socket/sys/net80211/ieee80211.c#2 integrate
.. //depot/projects/netperf_socket/sys/netatalk/ddp_usrreq.c#4 integrate
.. //depot/projects/netperf_socket/sys/netatalk/ddp_var.h#2 integrate
.. //depot/projects/netperf_socket/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate
.. //depot/projects/netperf_socket/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/netperf_socket/sys/pc98/conf/GENERIC.hints#3 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/canbus.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/fd.c#4 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/mse.c#3 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/olpt.c#3 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/pc98kbd.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/ppc.c#2 integrate
.. //depot/projects/netperf_socket/sys/pc98/pc98/sio.c#3 integrate
.. //depot/projects/netperf_socket/sys/pccard/mecia.c#2 integrate
.. //depot/projects/netperf_socket/sys/pccard/pcic_pci.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/agp.c#3 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_amd.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/agp_i810.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/alpm.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/amdpm.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/if_dc.c#3 integrate
.. //depot/projects/netperf_socket/sys/pci/if_de.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/if_mn.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/if_pcn.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/if_rl.c#5 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sf.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sis.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/if_sk.c#5 integrate
.. //depot/projects/netperf_socket/sys/pci/if_ste.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/if_ti.c#5 integrate
.. //depot/projects/netperf_socket/sys/pci/if_tl.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/if_vr.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/if_wb.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/if_xl.c#4 integrate
.. //depot/projects/netperf_socket/sys/pci/intpm.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/ncr.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/viapm.c#2 integrate
.. //depot/projects/netperf_socket/sys/pci/xrpu.c#3 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powermac/openpic_macio.c#3 integrate
.. //depot/projects/netperf_socket/sys/powerpc/powerpc/vm_machdep.c#3 integrate
.. //depot/projects/netperf_socket/sys/powerpc/psim/openpic_iobus.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/isa/isa.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_ebus.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_fhc.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/eeprom_sbus.c#2 integrate
.. //depot/projects/netperf_socket/sys/sparc64/sparc64/vm_machdep.c#2 integrate
.. //depot/projects/netperf_socket/sys/sys/ata.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/bus.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/limits.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/mount.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/sf_buf.h#2 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/syscall.mk#4 integrate
.. //depot/projects/netperf_socket/sys/sys/sysctl.h#3 integrate
.. //depot/projects/netperf_socket/sys/sys/sysproto.h#4 integrate
.. //depot/projects/netperf_socket/sys/sys/wait.h#2 integrate
.. //depot/projects/netperf_socket/sys/ufs/ffs/ffs_alloc.c#2 integrate
Differences ...
==== //depot/projects/netperf_socket/sys/alpha/alpha/vm_machdep.c#2 (text+ko) ====
@@ -67,7 +67,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.99 2003/12/28 08:57:08 silby Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/vm_machdep.c,v 1.100 2004/03/16 19:04:27 alc Exp $");
#include "opt_kstack_pages.h"
@@ -437,27 +437,12 @@
}
/*
- * Detatch mapped page and release resources back to the system.
+ * Release resources back to the system.
*/
void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
{
- 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);
nsfbufsused--;
==== //depot/projects/netperf_socket/sys/alpha/isa/isa.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.34 2003/11/17 06:10:14 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/isa/isa.c,v 1.35 2004/03/17 21:45:55 jmg Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -169,9 +169,7 @@
u_long start, u_long end, u_long count, u_int flags)
{
/*
- * Consider adding a resource definition. We allow rid 0-1 for
- * irq and drq, 0-3 for memory and 0-7 for ports which is
- * sufficient for isapnp.
+ * Consider adding a resource definition.
*/
int passthrough = (device_get_parent(child) != bus);
int isdefault = (start == 0UL && end == ~0UL);
==== //depot/projects/netperf_socket/sys/alpha/linux/linux_proto.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.15 2004/02/04 22:00:41 jhb Exp $
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp
+ * $FreeBSD: src/sys/alpha/linux/linux_proto.h,v 1.16 2004/03/15 22:44:35 jhb Exp $
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp
*/
#ifndef _LINUX_SYSPROTO_H_
==== //depot/projects/netperf_socket/sys/alpha/linux/linux_syscall.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.13 2004/02/04 22:00:41 jhb Exp $
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp
+ * $FreeBSD: src/sys/alpha/linux/linux_syscall.h,v 1.14 2004/03/15 22:44:35 jhb Exp $
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp
*/
#define LINUX_SYS_exit 1
==== //depot/projects/netperf_socket/sys/alpha/linux/linux_sysent.c#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.13 2004/02/04 22:00:41 jhb Exp $
- * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp
+ * $FreeBSD: src/sys/alpha/linux/linux_sysent.c,v 1.14 2004/03/15 22:44:35 jhb Exp $
+ * created from FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp
*/
#include "opt_compat.h"
@@ -24,7 +24,7 @@
{ SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */
{ 0, (sy_call_t *)nosys }, /* 5 = */
{ SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */
- { AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */
+ { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */
{ 0, (sy_call_t *)nosys }, /* 8 = */
{ AS(linux_link_args), (sy_call_t *)linux_link }, /* 9 = linux_link */
{ AS(linux_unlink_args), (sy_call_t *)linux_unlink }, /* 10 = linux_unlink */
==== //depot/projects/netperf_socket/sys/alpha/linux/syscalls.master#3 (text+ko) ====
@@ -1,4 +1,4 @@
- $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.55 2004/02/04 21:56:59 jhb Exp $
+ $FreeBSD: src/sys/alpha/linux/syscalls.master,v 1.56 2004/03/15 22:43:48 jhb Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from LINUX).
@@ -43,7 +43,7 @@
4 MNOPROTO { int write(int fd, char *buf, u_int nbyte); }
5 UNIMPL
6 MNOPROTO { int close(int fd); }
-7 STD { int osf1_wait4(int pid, int *status, int options, \
+7 MSTD { int osf1_wait4(int pid, int *status, int options, \
struct osf1_rusage *rusage); }
8 UNIMPL
9 STD { int linux_link(char *path, char *to); }
==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_misc.c#3 (text+ko) ====
@@ -30,7 +30,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.45 2004/02/04 21:52:52 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/osf1/osf1_misc.c,v 1.46 2004/03/17 19:59:59 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -68,6 +68,7 @@
#include <sys/user.h>
#include <sys/utsname.h>
#include <sys/vnode.h>
+#include <sys/wait.h>
#include <vm/vm.h>
#include <vm/vm_kern.h>
@@ -1376,27 +1377,23 @@
struct thread *td;
struct osf1_wait4_args *uap;
{
- int error;
- caddr_t sg;
- struct osf1_rusage *orusage, oru;
- struct rusage *rusage = NULL, ru;
+ int error, status;
+ struct osf1_rusage oru;
+ struct rusage ru;
- orusage = uap->rusage;
- if (orusage) {
- sg = stackgap_init();
- rusage = stackgap_alloc(&sg, sizeof(struct rusage));
- uap->rusage = (struct osf1_rusage *)rusage;
- }
- if ((error = wait4(td, (struct wait_args *)uap)))
- return error;
- if (orusage && (error = copyin(rusage, &ru, sizeof(ru)) == 0)){
+ error = kern_wait(td, uap->pid, &status, uap->options, &ru);
+ if (error)
+ return (error);
+ if (uap->status != NULL)
+ error = copyout(&status, uap->status, sizeof(status));
+ if (uap->rusage != NULL && error == 0) {
TV_CP(ru.ru_utime, oru.ru_utime);
TV_CP(ru.ru_stime, oru.ru_stime);
bcopy(&ru.ru_first, &oru.ru_first,
(&(oru.ru_last) - &(oru.ru_first)));
- copyout(&oru, orusage, sizeof (struct osf1_rusage));
+ error = copyout(&oru, uap->rusage, sizeof (struct osf1_rusage));
}
- return (0);
+ return (error);
}
==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_proto.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call prototypes.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.9 2004/02/04 22:00:41 jhb Exp $
- * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/alpha/osf1/osf1_proto.h,v 1.10 2004/03/15 22:44:35 jhb Exp $
+ * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp
*/
#ifndef _OSF1_SYSPROTO_H_
==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_syscall.h#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call numbers.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.8 2004/02/04 22:00:41 jhb Exp $
- * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/alpha/osf1/osf1_syscall.h,v 1.9 2004/03/15 22:44:35 jhb Exp $
+ * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp
*/
#define OSF1_SYS_nosys 0
==== //depot/projects/netperf_socket/sys/alpha/osf1/osf1_sysent.c#3 (text+ko) ====
@@ -2,8 +2,8 @@
* System call switch table.
*
* DO NOT EDIT-- this file is automatically generated.
- * $FreeBSD: src/sys/alpha/osf1/osf1_sysent.c,v 1.8 2004/02/04 22:00:41 jhb Exp $
- * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp
+ * $FreeBSD: src/sys/alpha/osf1/osf1_sysent.c,v 1.9 2004/03/15 22:44:35 jhb Exp $
+ * created from; FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp
*/
#include "opt_compat.h"
@@ -25,7 +25,7 @@
{ SYF_MPSAFE | AS(write_args), (sy_call_t *)write }, /* 4 = write */
{ 0, (sy_call_t *)nosys }, /* 5 = old open */
{ SYF_MPSAFE | AS(close_args), (sy_call_t *)close }, /* 6 = close */
- { AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */
+ { SYF_MPSAFE | AS(osf1_wait4_args), (sy_call_t *)osf1_wait4 }, /* 7 = osf1_wait4 */
{ 0, (sy_call_t *)nosys }, /* 8 = old creat */
{ AS(link_args), (sy_call_t *)link }, /* 9 = link */
{ AS(unlink_args), (sy_call_t *)unlink }, /* 10 = unlink */
==== //depot/projects/netperf_socket/sys/alpha/osf1/syscalls.master#3 (text+ko) ====
@@ -1,4 +1,4 @@
-; $FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.8 2004/02/04 21:57:00 jhb Exp $
+; $FreeBSD: src/sys/alpha/osf1/syscalls.master,v 1.9 2004/03/15 22:43:49 jhb Exp $
; @(#)syscalls.master 8.1 (Berkeley) 7/19/93
; System call name/number master file (or rather, slave, from OSF1).
@@ -37,7 +37,7 @@
4 MNOPROTO { ssize_t write(int fd, char *buf, ssize_t nbyte); }
5 UNIMPL old open
6 MNOPROTO { int close(int fd); }
-7 STD { int osf1_wait4(int pid, int *status, int options, \
+7 MSTD { int osf1_wait4(int pid, int *status, int options, \
struct osf1_rusage *rusage); }
8 UNIMPL old creat
9 NOPROTO { int link(char *path, char *link); }
==== //depot/projects/netperf_socket/sys/amd64/amd64/vm_machdep.c#3 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.228 2004/01/28 23:58:55 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.229 2004/03/16 19:04:27 alc Exp $");
#include "opt_isa.h"
#include "opt_kstack_pages.h"
@@ -490,27 +490,12 @@
}
/*
- * Detatch mapped page and release resources back to the system.
+ * Release resources back to the system.
*/
void
-sf_buf_free(void *addr, void *args)
+sf_buf_free(struct sf_buf *sf)
{
- 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);
nsfbufsused--;
==== //depot/projects/netperf_socket/sys/amd64/isa/atpic.c#3 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.9 2004/01/28 23:46:48 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/atpic.c,v 1.10 2004/03/17 17:50:23 njl Exp $");
#include "opt_auto_eoi.h"
#include "opt_isa.h"
@@ -392,7 +392,7 @@
/* Try to allocate our IRQ and then free it. */
rid = 0;
- res = bus_alloc_resource(dev, SYS_RES_IRQ, &rid, 0, ~0, 1, 0);
+ res = bus_alloc_resource_any(dev, SYS_RES_IRQ, &rid, 0);
if (res != NULL)
bus_release_resource(dev, SYS_RES_IRQ, rid, res);
return (0);
==== //depot/projects/netperf_socket/sys/amd64/isa/isa.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.145 2003/11/21 03:02:00 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.146 2004/03/17 21:45:55 jmg Exp $");
/*
* Modifications for Intel architecture by Garrett A. Wollman.
@@ -86,9 +86,7 @@
u_long start, u_long end, u_long count, u_int flags)
{
/*
- * Consider adding a resource definition. We allow rid 0-1 for
- * irq and drq, 0-3 for memory and 0-7 for ports which is
- * sufficient for isapnp.
+ * Consider adding a resource definition.
*/
int passthrough = (device_get_parent(child) != bus);
int isdefault = (start == 0UL && end == ~0UL);
==== //depot/projects/netperf_socket/sys/compat/freebsd32/freebsd32_misc.c#3 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.19 2004/01/28 23:45:48 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/freebsd32/freebsd32_misc.c,v 1.20 2004/03/17 19:59:59 jhb Exp $");
#include "opt_compat.h"
@@ -67,6 +67,7 @@
#include <sys/user.h>
#include <sys/utsname.h>
#include <sys/vnode.h>
+#include <sys/wait.h>
#include <vm/vm.h>
#include <vm/vm_kern.h>
@@ -88,21 +89,16 @@
int
freebsd32_wait4(struct thread *td, struct freebsd32_wait4_args *uap)
{
- int error;
- caddr_t sg;
- struct rusage32 *rusage32, ru32;
- struct rusage *rusage = NULL, ru;
+ int error, status;
+ struct rusage32 ru32;
+ struct rusage ru;
- rusage32 = uap->rusage;
- if (rusage32) {
- sg = stackgap_init();
- rusage = stackgap_alloc(&sg, sizeof(struct rusage));
- uap->rusage = (struct rusage32 *)rusage;
- }
- error = wait4(td, (struct wait_args *)uap);
+ error = kern_wait(td, uap->pid, &status, uap->options, &ru);
if (error)
return (error);
- if (rusage32 && (error = copyin(rusage, &ru, sizeof(ru)) == 0)) {
+ if (uap->status != NULL)
+ error = copyout(&status, uap->status, sizeof(status));
+ if (uap->rusage != NULL && error == 0) {
TV_CP(ru, ru32, ru_utime);
TV_CP(ru, ru32, ru_stime);
CP(ru, ru32, ru_maxrss);
@@ -119,7 +115,7 @@
CP(ru, ru32, ru_nsignals);
CP(ru, ru32, ru_nvcsw);
CP(ru, ru32, ru_nivcsw);
- error = copyout(&ru32, rusage32, sizeof(ru32));
+ error = copyout(&ru32, uap->rusage, sizeof(ru32));
}
return (error);
}
==== //depot/projects/netperf_socket/sys/compat/linux/linux_file.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.83 2003/11/19 04:12:31 kan Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_file.c,v 1.85 2004/03/16 09:05:56 tjr Exp $");
#include "opt_compat.h"
#include "opt_mac.h"
@@ -732,19 +732,20 @@
struct ufs_args ufs;
char fstypename[MFSNAMELEN];
char mntonname[MNAMELEN], mntfromname[MNAMELEN];
+ struct uio auio;
+ struct iovec iov[4];
int error;
int fsflags;
- const char *fstype;
void *fsdata;
error = copyinstr(args->filesystemtype, fstypename, MFSNAMELEN - 1,
NULL);
if (error)
return (error);
- error = copyinstr(args->specialfile, mntfromname, MFSNAMELEN - 1, NULL);
+ error = copyinstr(args->specialfile, mntfromname, MNAMELEN - 1, NULL);
if (error)
return (error);
- error = copyinstr(args->dir, mntonname, MFSNAMELEN - 1, NULL);
+ error = copyinstr(args->dir, mntonname, MNAMELEN - 1, NULL);
if (error)
return (error);
@@ -755,7 +756,7 @@
#endif
if (strcmp(fstypename, "ext2") == 0) {
- fstype = "ext2fs";
+ strcpy(fstypename, "ext2fs");
fsdata = &ufs;
ufs.fspec = mntfromname;
#define DEFAULT_ROOTID -2
@@ -763,7 +764,7 @@
ufs.export.ex_flags =
args->rwflag & LINUX_MS_RDONLY ? MNT_EXRDONLY : 0;
} else if (strcmp(fstypename, "proc") == 0) {
- fstype = "linprocfs";
+ strcpy(fstypename, "linprocfs");
fsdata = NULL;
} else {
return (ENODEV);
@@ -788,7 +789,23 @@
fsflags |= MNT_UPDATE;
}
- return (vfs_mount(td, fstype, mntonname, fsflags, fsdata));
+ if (strcmp(fstypename, "linprocfs") == 0) {
+ bzero(&auio, sizeof(auio));
+ auio.uio_iov = iov;
+ auio.uio_iovcnt = sizeof(iov) / sizeof(*iov);
+ auio.uio_segflg = UIO_SYSSPACE;
+ iov[0].iov_base = "fstype";
+ iov[0].iov_len = sizeof("fstype");
+ iov[1].iov_base = fstypename;
+ iov[1].iov_len = strlen(fstypename) + 1;
+ iov[2].iov_base = "fspath";
+ iov[2].iov_len = sizeof("fspath");
+ iov[3].iov_base = mntonname;
+ iov[3].iov_len = strlen(mntonname) + 1;
+ error = vfs_nmount(td, fsflags, &auio);
+ } else
+ error = vfs_mount(td, fstypename, mntonname, fsflags, fsdata);
+ return (error);
}
int
==== //depot/projects/netperf_socket/sys/compat/linux/linux_misc.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.152 2004/02/04 21:52:53 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/compat/linux/linux_misc.c,v 1.153 2004/03/17 19:59:59 jhb Exp $");
#include "opt_mac.h"
@@ -795,13 +795,7 @@
int
linux_waitpid(struct thread *td, struct linux_waitpid_args *args)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list