PERFORCE change 55131 for review
Julian Elischer
julian at FreeBSD.org
Thu Jun 17 04:03:55 GMT 2004
http://perforce.freebsd.org/chv.cgi?CH=55131
Change 55131 by julian at julian_jules1 on 2004/06/17 04:03:13
IFC
Affected files ...
.. //depot/projects/nsched/sys/alpha/alpha/mem.c#4 integrate
.. //depot/projects/nsched/sys/alpha/alpha/pmap.c#5 integrate
.. //depot/projects/nsched/sys/alpha/alpha/promcons.c#3 integrate
.. //depot/projects/nsched/sys/alpha/alpha/uma_machdep.c#1 branch
.. //depot/projects/nsched/sys/alpha/include/cpu.h#3 integrate
.. //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#3 integrate
.. //depot/projects/nsched/sys/amd64/amd64/mem.c#4 integrate
.. //depot/projects/nsched/sys/amd64/amd64/pmap.c#8 integrate
.. //depot/projects/nsched/sys/amd64/conf/GENERIC#5 integrate
.. //depot/projects/nsched/sys/amd64/include/cpu.h#3 integrate
.. //depot/projects/nsched/sys/amd64/include/pmap.h#7 integrate
.. //depot/projects/nsched/sys/arm/arm/nexus_io.c#2 integrate
.. //depot/projects/nsched/sys/arm/include/bus.h#2 integrate
.. //depot/projects/nsched/sys/arm/sa11x0/sa11x0_io.c#2 integrate
.. //depot/projects/nsched/sys/boot/i386/libi386/bioscd.c#2 integrate
.. //depot/projects/nsched/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/nsched/sys/boot/i386/libi386/libi386.h#2 integrate
.. //depot/projects/nsched/sys/boot/pc98/boot2/dinode.h#3 integrate
.. //depot/projects/nsched/sys/boot/pc98/boot2/inode.h#3 integrate
.. //depot/projects/nsched/sys/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/nsched/sys/cam/cam_xpt.c#2 integrate
.. //depot/projects/nsched/sys/cam/scsi/scsi_ch.c#2 integrate
.. //depot/projects/nsched/sys/cam/scsi/scsi_pass.c#2 integrate
.. //depot/projects/nsched/sys/cam/scsi/scsi_pt.c#2 integrate
.. //depot/projects/nsched/sys/cam/scsi/scsi_sa.c#2 integrate
.. //depot/projects/nsched/sys/cam/scsi/scsi_ses.c#2 integrate
.. //depot/projects/nsched/sys/cam/scsi/scsi_target.c#2 integrate
.. //depot/projects/nsched/sys/coda/cnode.h#2 integrate
.. //depot/projects/nsched/sys/coda/coda.h#2 integrate
.. //depot/projects/nsched/sys/coda/coda_fbsd.c#3 integrate
.. //depot/projects/nsched/sys/coda/coda_psdev.c#2 integrate
.. //depot/projects/nsched/sys/coda/coda_psdev.h#2 integrate
.. //depot/projects/nsched/sys/coda/coda_venus.c#2 integrate
.. //depot/projects/nsched/sys/coda/coda_venus.h#2 integrate
.. //depot/projects/nsched/sys/coda/coda_vfsops.c#2 integrate
.. //depot/projects/nsched/sys/coda/coda_vnops.c#2 integrate
.. //depot/projects/nsched/sys/coda/coda_vnops.h#2 integrate
.. //depot/projects/nsched/sys/compat/linux/linux_ioctl.c#2 integrate
.. //depot/projects/nsched/sys/compat/linux/linux_ioctl.h#2 integrate
.. //depot/projects/nsched/sys/compat/linux/linux_stats.c#2 integrate
.. //depot/projects/nsched/sys/compat/svr4/svr4_stream.c#2 integrate
.. //depot/projects/nsched/sys/conf/NOTES#6 integrate
.. //depot/projects/nsched/sys/conf/files#11 integrate
.. //depot/projects/nsched/sys/conf/files.alpha#3 integrate
.. //depot/projects/nsched/sys/conf/kern.pre.mk#3 integrate
.. //depot/projects/nsched/sys/conf/kmod.mk#5 integrate
.. //depot/projects/nsched/sys/conf/options#7 integrate
.. //depot/projects/nsched/sys/contrib/altq/altq/altq.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_cbq.c#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_cbq.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_cdnr.c#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_cdnr.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_classq.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_hfsc.c#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_hfsc.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_priq.c#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_priq.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_red.c#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_red.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_rio.c#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_rio.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_rmclass.c#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_rmclass.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_rmclass_debug.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_subr.c#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altq_var.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/altqconf.h#1 branch
.. //depot/projects/nsched/sys/contrib/altq/altq/if_altq.h#1 branch
.. //depot/projects/nsched/sys/contrib/dev/fla/fla.c#2 integrate
.. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_fil.c#2 integrate
.. //depot/projects/nsched/sys/contrib/ipfilter/netinet/ip_fil.h#2 integrate
.. //depot/projects/nsched/sys/contrib/ipfilter/netinet/mlfk_ipl.c#2 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/if_pflog.c#4 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/if_pflog.h#2 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/if_pfsync.c#4 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/if_pfsync.h#2 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/pf.c#3 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/pf_if.c#1 branch
.. //depot/projects/nsched/sys/contrib/pf/net/pf_ioctl.c#4 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/pf_norm.c#3 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/pf_osfp.c#2 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/pf_subr.c#1 branch
.. //depot/projects/nsched/sys/contrib/pf/net/pf_table.c#2 integrate
.. //depot/projects/nsched/sys/contrib/pf/net/pfvar.h#2 integrate
.. //depot/projects/nsched/sys/contrib/pf/netinet/in4_cksum.c#2 integrate
.. //depot/projects/nsched/sys/crypto/des/des_ecb.c#2 integrate
.. //depot/projects/nsched/sys/crypto/des/des_enc.c#2 integrate
.. //depot/projects/nsched/sys/crypto/des/des_setkey.c#2 integrate
.. //depot/projects/nsched/sys/dev/aac/aac.c#4 integrate
.. //depot/projects/nsched/sys/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/nsched/sys/dev/aac/aacvar.h#4 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi.c#6 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_acad.c#5 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_button.c#4 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_cmbat.c#4 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_ec.c#6 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_isab.c#4 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_lid.c#4 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_pci_link.c#4 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_pcib_acpi.c#4 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpi_resource.c#4 integrate
.. //depot/projects/nsched/sys/dev/acpica/acpivar.h#5 integrate
.. //depot/projects/nsched/sys/dev/adlink/adlink.c#3 integrate
.. //depot/projects/nsched/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/nsched/sys/dev/amr/amrvar.h#2 integrate
.. //depot/projects/nsched/sys/dev/an/if_an.c#3 integrate
.. //depot/projects/nsched/sys/dev/asr/asr.c#4 integrate
.. //depot/projects/nsched/sys/dev/ata/ata-all.c#4 integrate
.. //depot/projects/nsched/sys/dev/ata/ata-chipset.c#3 integrate
.. //depot/projects/nsched/sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/nsched/sys/dev/ata/ata-pci.h#3 integrate
.. //depot/projects/nsched/sys/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/nsched/sys/dev/ata/atapi-tape.h#3 integrate
.. //depot/projects/nsched/sys/dev/awi/awi.c#3 integrate
.. //depot/projects/nsched/sys/dev/bktr/bktr_core.c#3 integrate
.. //depot/projects/nsched/sys/dev/bktr/bktr_core.h#2 integrate
.. //depot/projects/nsched/sys/dev/bktr/bktr_os.c#3 integrate
.. //depot/projects/nsched/sys/dev/bktr/bktr_reg.h#2 integrate
.. //depot/projects/nsched/sys/dev/ciss/ciss.c#5 integrate
.. //depot/projects/nsched/sys/dev/ciss/cissvar.h#3 integrate
.. //depot/projects/nsched/sys/dev/cp/if_cp.c#3 integrate
.. //depot/projects/nsched/sys/dev/ctau/if_ct.c#4 integrate
.. //depot/projects/nsched/sys/dev/cx/if_cx.c#5 integrate
.. //depot/projects/nsched/sys/dev/cy/cy.c#5 integrate
.. //depot/projects/nsched/sys/dev/dcons/dcons.c#4 integrate
.. //depot/projects/nsched/sys/dev/digi/digi.c#5 integrate
.. //depot/projects/nsched/sys/dev/digi/digi.h#2 integrate
.. //depot/projects/nsched/sys/dev/drm/drmP.h#3 integrate
.. //depot/projects/nsched/sys/dev/drm/drm_drv.h#3 integrate
.. //depot/projects/nsched/sys/dev/drm/drm_fops.h#2 integrate
.. //depot/projects/nsched/sys/dev/drm/drm_os_freebsd.h#3 integrate
.. //depot/projects/nsched/sys/dev/drm/drm_vm.h#2 integrate
.. //depot/projects/nsched/sys/dev/esp/esp_sbus.c#3 integrate
.. //depot/projects/nsched/sys/dev/esp/ncr53c9x.c#3 integrate
.. //depot/projects/nsched/sys/dev/esp/ncr53c9xvar.h#3 integrate
.. //depot/projects/nsched/sys/dev/fb/gfb.h#2 integrate
.. //depot/projects/nsched/sys/dev/fb/vga.c#4 integrate
.. //depot/projects/nsched/sys/dev/fb/vgareg.h#2 integrate
.. //depot/projects/nsched/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/nsched/sys/dev/firewire/firewire.c#4 integrate
.. //depot/projects/nsched/sys/dev/firewire/firewirereg.h#3 integrate
.. //depot/projects/nsched/sys/dev/firewire/fwdev.c#3 integrate
.. //depot/projects/nsched/sys/dev/firewire/fwmem.c#3 integrate
.. //depot/projects/nsched/sys/dev/firewire/fwohci.c#3 integrate
.. //depot/projects/nsched/sys/dev/firewire/if_fwip.c#1 branch
.. //depot/projects/nsched/sys/dev/firewire/if_fwipvar.h#1 branch
.. //depot/projects/nsched/sys/dev/firewire/sbp.c#3 integrate
.. //depot/projects/nsched/sys/dev/gfb/gfb_pci.c#2 integrate
.. //depot/projects/nsched/sys/dev/hme/if_hme.c#5 integrate
.. //depot/projects/nsched/sys/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/nsched/sys/dev/ida/ida.c#2 integrate
.. //depot/projects/nsched/sys/dev/ida/idavar.h#2 integrate
.. //depot/projects/nsched/sys/dev/iicbus/iic.c#3 integrate
.. //depot/projects/nsched/sys/dev/iir/iir.h#3 integrate
.. //depot/projects/nsched/sys/dev/iir/iir_ctrl.c#3 integrate
.. //depot/projects/nsched/sys/dev/ips/ips.c#3 integrate
.. //depot/projects/nsched/sys/dev/ips/ips.h#3 integrate
.. //depot/projects/nsched/sys/dev/ips/ips_commands.c#3 integrate
.. //depot/projects/nsched/sys/dev/isp/isp_freebsd.c#3 integrate
.. //depot/projects/nsched/sys/dev/joy/joy.c#2 integrate
.. //depot/projects/nsched/sys/dev/joy/joyvar.h#2 integrate
.. //depot/projects/nsched/sys/dev/kbd/kbd.c#2 integrate
.. //depot/projects/nsched/sys/dev/kbd/kbdreg.h#2 integrate
.. //depot/projects/nsched/sys/dev/led/led.c#3 integrate
.. //depot/projects/nsched/sys/dev/led/led.h#3 integrate
.. //depot/projects/nsched/sys/dev/matcd/matcd.c#2 integrate
.. //depot/projects/nsched/sys/dev/matcd/matcd_data.h#2 integrate
.. //depot/projects/nsched/sys/dev/mcd/mcd.c#2 integrate
.. //depot/projects/nsched/sys/dev/mcd/mcdvar.h#2 integrate
.. //depot/projects/nsched/sys/dev/md/md.c#5 integrate
.. //depot/projects/nsched/sys/dev/mlx/mlx.c#2 integrate
.. //depot/projects/nsched/sys/dev/mlx/mlxvar.h#2 integrate
.. //depot/projects/nsched/sys/dev/mly/mly.c#2 integrate
.. //depot/projects/nsched/sys/dev/mly/mlyvar.h#2 integrate
.. //depot/projects/nsched/sys/dev/nmdm/nmdm.c#5 integrate
.. //depot/projects/nsched/sys/dev/null/null.c#2 integrate
.. //depot/projects/nsched/sys/dev/ofw/ofw_console.c#3 integrate
.. //depot/projects/nsched/sys/dev/ofw/openfirmio.c#4 integrate
.. //depot/projects/nsched/sys/dev/ofw/openpromio.c#2 integrate
.. //depot/projects/nsched/sys/dev/pci/pci.c#5 integrate
.. //depot/projects/nsched/sys/dev/pci/pci_user.c#2 integrate
.. //depot/projects/nsched/sys/dev/pdq/pdq_freebsd.h#2 integrate
.. //depot/projects/nsched/sys/dev/ppbus/lpt.c#2 integrate
.. //depot/projects/nsched/sys/dev/ppbus/pcfclock.c#3 integrate
.. //depot/projects/nsched/sys/dev/ppbus/ppi.c#2 integrate
.. //depot/projects/nsched/sys/dev/ppbus/pps.c#2 integrate
.. //depot/projects/nsched/sys/dev/random/randomdev.c#5 integrate
.. //depot/projects/nsched/sys/dev/rc/rc.c#4 integrate
.. //depot/projects/nsched/sys/dev/rp/rp.c#4 integrate
.. //depot/projects/nsched/sys/dev/rp/rpreg.h#2 integrate
.. //depot/projects/nsched/sys/dev/sab/sab.c#3 integrate
.. //depot/projects/nsched/sys/dev/scd/scd.c#2 integrate
.. //depot/projects/nsched/sys/dev/scd/scdvar.h#2 integrate
.. //depot/projects/nsched/sys/dev/si/si.c#4 integrate
.. //depot/projects/nsched/sys/dev/sio/sio.c#6 integrate
.. //depot/projects/nsched/sys/dev/smbus/smb.c#3 integrate
.. //depot/projects/nsched/sys/dev/snp/snp.c#3 integrate
.. //depot/projects/nsched/sys/dev/sound/isa/sb16.c#4 integrate
.. //depot/projects/nsched/sys/dev/sound/pci/emu10k1.c#4 integrate
.. //depot/projects/nsched/sys/dev/sound/pcm/dsp.c#2 integrate
.. //depot/projects/nsched/sys/dev/sound/pcm/mixer.c#2 integrate
.. //depot/projects/nsched/sys/dev/sound/pcm/mixer.h#2 integrate
.. //depot/projects/nsched/sys/dev/sound/pcm/sndstat.c#2 integrate
.. //depot/projects/nsched/sys/dev/sound/pcm/sound.h#3 integrate
.. //depot/projects/nsched/sys/dev/streams/streams.c#2 integrate
.. //depot/projects/nsched/sys/dev/sx/sx.c#4 integrate
.. //depot/projects/nsched/sys/dev/syscons/scvesactl.c#2 integrate
.. //depot/projects/nsched/sys/dev/syscons/syscons.c#3 integrate
.. //depot/projects/nsched/sys/dev/syscons/syscons.h#2 integrate
.. //depot/projects/nsched/sys/dev/syscons/sysmouse.c#3 integrate
.. //depot/projects/nsched/sys/dev/tdfx/tdfx_pci.c#3 integrate
.. //depot/projects/nsched/sys/dev/tdfx/tdfx_vars.h#2 integrate
.. //depot/projects/nsched/sys/dev/twa/twa.h#3 integrate
.. //depot/projects/nsched/sys/dev/twa/twa_freebsd.c#3 integrate
.. //depot/projects/nsched/sys/dev/twe/twe_compat.h#3 integrate
.. //depot/projects/nsched/sys/dev/twe/twe_freebsd.c#3 integrate
.. //depot/projects/nsched/sys/dev/uart/uart_bus.h#2 integrate
.. //depot/projects/nsched/sys/dev/uart/uart_tty.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/if_udav.c#4 integrate
.. //depot/projects/nsched/sys/dev/usb/ubser.c#4 integrate
.. //depot/projects/nsched/sys/dev/usb/ucom.c#5 integrate
.. //depot/projects/nsched/sys/dev/usb/ucomvar.h#2 integrate
.. //depot/projects/nsched/sys/dev/usb/ufm.c#2 integrate
.. //depot/projects/nsched/sys/dev/usb/ugen.c#2 integrate
.. //depot/projects/nsched/sys/dev/usb/uhid.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/ulpt.c#2 integrate
.. //depot/projects/nsched/sys/dev/usb/ums.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/urio.c#2 integrate
.. //depot/projects/nsched/sys/dev/usb/usb.c#3 integrate
.. //depot/projects/nsched/sys/dev/usb/uscanner.c#2 integrate
.. //depot/projects/nsched/sys/dev/vinum/vinum.c#2 integrate
.. //depot/projects/nsched/sys/dev/vinum/vinumext.h#2 integrate
.. //depot/projects/nsched/sys/dev/vinum/vinumioctl.c#2 integrate
.. //depot/projects/nsched/sys/dev/vinum/vinumobj.h#2 integrate
.. //depot/projects/nsched/sys/dev/vinum/vinumutil.c#2 integrate
.. //depot/projects/nsched/sys/dev/watchdog/watchdog.c#2 integrate
.. //depot/projects/nsched/sys/dev/wi/if_wi.c#2 integrate
.. //depot/projects/nsched/sys/dev/zs/z8530var.h#2 integrate
.. //depot/projects/nsched/sys/dev/zs/zs.c#4 integrate
.. //depot/projects/nsched/sys/fs/devfs/devfs.h#2 integrate
.. //depot/projects/nsched/sys/fs/devfs/devfs_devs.c#2 integrate
.. //depot/projects/nsched/sys/fs/devfs/devfs_rule.c#2 integrate
.. //depot/projects/nsched/sys/fs/devfs/devfs_vnops.c#2 integrate
.. //depot/projects/nsched/sys/fs/fifofs/fifo_vnops.c#5 integrate
.. //depot/projects/nsched/sys/fs/hpfs/hpfs.h#2 integrate
.. //depot/projects/nsched/sys/fs/hpfs/hpfs_hash.c#3 integrate
.. //depot/projects/nsched/sys/fs/hpfs/hpfs_vfsops.c#2 integrate
.. //depot/projects/nsched/sys/fs/msdosfs/msdosfs_denode.c#2 integrate
.. //depot/projects/nsched/sys/fs/msdosfs/msdosfs_vfsops.c#2 integrate
.. //depot/projects/nsched/sys/fs/msdosfs/msdosfsmount.h#2 integrate
.. //depot/projects/nsched/sys/fs/ntfs/ntfs.h#2 integrate
.. //depot/projects/nsched/sys/fs/ntfs/ntfs_ihash.c#3 integrate
.. //depot/projects/nsched/sys/fs/ntfs/ntfs_ihash.h#2 integrate
.. //depot/projects/nsched/sys/fs/ntfs/ntfs_inode.h#2 integrate
.. //depot/projects/nsched/sys/fs/ntfs/ntfs_vfsops.c#2 integrate
.. //depot/projects/nsched/sys/fs/specfs/spec_vnops.c#4 integrate
.. //depot/projects/nsched/sys/fs/udf/udf.h#2 integrate
.. //depot/projects/nsched/sys/geom/gate/g_gate.c#2 integrate
.. //depot/projects/nsched/sys/geom/geom.h#2 integrate
.. //depot/projects/nsched/sys/geom/geom_ctl.c#2 integrate
.. //depot/projects/nsched/sys/geom/geom_dev.c#2 integrate
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum.h#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_drive.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_init.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_list.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_plex.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_raid5.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_raid5.h#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_rm.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_share.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_share.h#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_state.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_subr.c#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_var.h#1 branch
.. //depot/projects/nsched/sys/geom/vinum/geom_vinum_volume.c#1 branch
.. //depot/projects/nsched/sys/gnu/ext2fs/ext2_extern.h#3 integrate
.. //depot/projects/nsched/sys/gnu/ext2fs/ext2_ihash.c#3 integrate
.. //depot/projects/nsched/sys/gnu/ext2fs/ext2_mount.h#3 integrate
.. //depot/projects/nsched/sys/gnu/ext2fs/ext2_vfsops.c#3 integrate
.. //depot/projects/nsched/sys/gnu/ext2fs/inode.h#3 integrate
.. //depot/projects/nsched/sys/i386/acpica/acpi_asus.c#3 integrate
.. //depot/projects/nsched/sys/i386/acpica/acpi_machdep.c#4 integrate
.. //depot/projects/nsched/sys/i386/acpica/acpi_toshiba.c#5 integrate
.. //depot/projects/nsched/sys/i386/bios/apm.c#3 integrate
.. //depot/projects/nsched/sys/i386/bios/apm.h#2 integrate
.. //depot/projects/nsched/sys/i386/bios/smapi.c#3 integrate
.. //depot/projects/nsched/sys/i386/conf/NOTES#5 integrate
.. //depot/projects/nsched/sys/i386/i386/bios.c#4 integrate
.. //depot/projects/nsched/sys/i386/i386/elan-mmcr.c#4 integrate
.. //depot/projects/nsched/sys/i386/i386/geode.c#3 integrate
.. //depot/projects/nsched/sys/i386/i386/machdep.c#9 integrate
.. //depot/projects/nsched/sys/i386/i386/mem.c#4 integrate
.. //depot/projects/nsched/sys/i386/i386/perfmon.c#2 integrate
.. //depot/projects/nsched/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/nsched/sys/i386/ibcs2/ibcs2_misc.c#2 integrate
.. //depot/projects/nsched/sys/i386/include/cpu.h#3 integrate
.. //depot/projects/nsched/sys/i386/include/pmap.h#4 integrate
.. //depot/projects/nsched/sys/i386/isa/mse.c#3 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_drv.c#3 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_ext.c#3 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_hdr.h#4 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_kbd.c#2 integrate
.. //depot/projects/nsched/sys/i386/isa/pcvt/pcvt_sup.c#3 integrate
.. //depot/projects/nsched/sys/i386/isa/spic.c#3 integrate
.. //depot/projects/nsched/sys/i386/isa/spkr.c#2 integrate
.. //depot/projects/nsched/sys/i4b/driver/i4b_ctl.c#2 integrate
.. //depot/projects/nsched/sys/i4b/driver/i4b_ipr.c#2 integrate
.. //depot/projects/nsched/sys/i4b/driver/i4b_rbch.c#2 integrate
.. //depot/projects/nsched/sys/i4b/driver/i4b_tel.c#2 integrate
.. //depot/projects/nsched/sys/i4b/driver/i4b_trace.c#2 integrate
.. //depot/projects/nsched/sys/i4b/layer4/i4b_i4bdrv.c#2 integrate
.. //depot/projects/nsched/sys/ia64/ia64/mem.c#4 integrate
.. //depot/projects/nsched/sys/ia64/ia64/pmap.c#5 integrate
.. //depot/projects/nsched/sys/ia64/ia64/ssc.c#3 integrate
.. //depot/projects/nsched/sys/ia64/ia64/sscdisk.c#2 integrate
.. //depot/projects/nsched/sys/ia64/include/cpu.h#3 integrate
.. //depot/projects/nsched/sys/isa/psm.c#4 integrate
.. //depot/projects/nsched/sys/isa/vga_isa.c#3 integrate
.. //depot/projects/nsched/sys/isofs/cd9660/cd9660_node.c#3 integrate
.. //depot/projects/nsched/sys/isofs/cd9660/cd9660_node.h#3 integrate
.. //depot/projects/nsched/sys/isofs/cd9660/cd9660_vfsops.c#3 integrate
.. //depot/projects/nsched/sys/isofs/cd9660/iso.h#3 integrate
.. //depot/projects/nsched/sys/kern/init_main.c#8 integrate
.. //depot/projects/nsched/sys/kern/kern_clock.c#5 integrate
.. //depot/projects/nsched/sys/kern/kern_conf.c#3 integrate
.. //depot/projects/nsched/sys/kern/kern_descrip.c#5 integrate
.. //depot/projects/nsched/sys/kern/kern_physio.c#2 integrate
.. //depot/projects/nsched/sys/kern/kern_proc.c#7 integrate
.. //depot/projects/nsched/sys/kern/kern_prot.c#4 integrate
.. //depot/projects/nsched/sys/kern/kern_resource.c#5 integrate
.. //depot/projects/nsched/sys/kern/kern_sema.c#2 integrate
.. //depot/projects/nsched/sys/kern/link_elf_obj.c#4 integrate
.. //depot/projects/nsched/sys/kern/sched_4bsd.c#14 integrate
.. //depot/projects/nsched/sys/kern/sched_ule.c#6 integrate
.. //depot/projects/nsched/sys/kern/subr_bus.c#4 integrate
.. //depot/projects/nsched/sys/kern/subr_devstat.c#2 integrate
.. //depot/projects/nsched/sys/kern/subr_log.c#3 integrate
.. //depot/projects/nsched/sys/kern/subr_witness.c#3 integrate
.. //depot/projects/nsched/sys/kern/sys_socket.c#3 integrate
.. //depot/projects/nsched/sys/kern/tty.c#5 integrate
.. //depot/projects/nsched/sys/kern/tty_conf.c#4 integrate
.. //depot/projects/nsched/sys/kern/tty_cons.c#3 integrate
.. //depot/projects/nsched/sys/kern/tty_pty.c#5 integrate
.. //depot/projects/nsched/sys/kern/tty_tty.c#2 integrate
.. //depot/projects/nsched/sys/kern/uipc_socket.c#4 integrate
.. //depot/projects/nsched/sys/kern/uipc_socket2.c#5 integrate
.. //depot/projects/nsched/sys/kern/uipc_syscalls.c#7 integrate
.. //depot/projects/nsched/sys/kern/uipc_usrreq.c#4 integrate
.. //depot/projects/nsched/sys/kern/vfs_bio.c#3 integrate
.. //depot/projects/nsched/sys/kern/vfs_mount.c#3 integrate
.. //depot/projects/nsched/sys/kern/vfs_subr.c#5 integrate
.. //depot/projects/nsched/sys/modules/Makefile#4 integrate
.. //depot/projects/nsched/sys/modules/geom/geom_vinum/Makefile#1 branch
.. //depot/projects/nsched/sys/modules/pf/Makefile#3 integrate
.. //depot/projects/nsched/sys/modules/pflog/Makefile#3 delete
.. //depot/projects/nsched/sys/modules/pfsync/Makefile#3 delete
.. //depot/projects/nsched/sys/net/bpf.c#4 integrate
.. //depot/projects/nsched/sys/net/bridge.c#4 integrate
.. //depot/projects/nsched/sys/net/firewire.h#1 branch
.. //depot/projects/nsched/sys/net/if.c#4 integrate
.. //depot/projects/nsched/sys/net/if_arcsubr.c#5 integrate
.. //depot/projects/nsched/sys/net/if_arp.h#4 integrate
.. //depot/projects/nsched/sys/net/if_ef.c#3 integrate
.. //depot/projects/nsched/sys/net/if_ethersubr.c#6 integrate
.. //depot/projects/nsched/sys/net/if_fddisubr.c#4 integrate
.. //depot/projects/nsched/sys/net/if_fwsubr.c#1 branch
.. //depot/projects/nsched/sys/net/if_iso88025subr.c#4 integrate
.. //depot/projects/nsched/sys/net/if_ppp.c#3 integrate
.. //depot/projects/nsched/sys/net/if_sl.c#4 integrate
.. //depot/projects/nsched/sys/net/if_spppsubr.c#3 integrate
.. //depot/projects/nsched/sys/net/if_tap.c#3 integrate
.. //depot/projects/nsched/sys/net/if_tapvar.h#2 integrate
.. //depot/projects/nsched/sys/net/if_tun.c#2 integrate
.. //depot/projects/nsched/sys/net/if_var.h#4 integrate
.. //depot/projects/nsched/sys/net/if_vlan.c#4 integrate
.. //depot/projects/nsched/sys/net/ppp_tty.c#2 integrate
.. //depot/projects/nsched/sys/net/raw_cb.c#4 integrate
.. //depot/projects/nsched/sys/net/raw_cb.h#3 integrate
.. //depot/projects/nsched/sys/net/raw_usrreq.c#3 integrate
.. //depot/projects/nsched/sys/net80211/ieee80211_input.c#3 integrate
.. //depot/projects/nsched/sys/netatalk/ddp_input.c#2 integrate
.. //depot/projects/nsched/sys/netatalk/ddp_output.c#2 integrate
.. //depot/projects/nsched/sys/netatalk/ddp_pcb.c#2 integrate
.. //depot/projects/nsched/sys/netatm/atm_aal5.c#2 integrate
.. //depot/projects/nsched/sys/netatm/atm_socket.c#2 integrate
.. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#4 integrate
.. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt.c#5 integrate
.. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubt/ng_ubt_var.h#2 integrate
.. //depot/projects/nsched/sys/netgraph/bluetooth/drivers/ubtbcmfw/ubtbcmfw.c#3 integrate
.. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_hci_raw.c#4 integrate
.. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#4 integrate
.. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap_raw.c#4 integrate
.. //depot/projects/nsched/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate
.. //depot/projects/nsched/sys/netgraph/ng_device.c#3 integrate
.. //depot/projects/nsched/sys/netgraph/ng_ksocket.c#4 integrate
.. //depot/projects/nsched/sys/netgraph/ng_rfc1490.c#3 integrate
.. //depot/projects/nsched/sys/netgraph/ng_rfc1490.h#2 integrate
.. //depot/projects/nsched/sys/netgraph/ng_tty.c#3 integrate
.. //depot/projects/nsched/sys/netinet/accf_http.c#3 integrate
.. //depot/projects/nsched/sys/netinet/if_ether.c#4 integrate
.. //depot/projects/nsched/sys/netinet/in.h#4 integrate
.. //depot/projects/nsched/sys/netinet/in_pcb.c#5 integrate
.. //depot/projects/nsched/sys/netinet/in_proto.c#3 integrate
.. //depot/projects/nsched/sys/netinet/ip_divert.c#4 integrate
.. //depot/projects/nsched/sys/netinet/ip_fw2.c#5 integrate
.. //depot/projects/nsched/sys/netinet/ip_input.c#4 integrate
.. //depot/projects/nsched/sys/netinet/ip_output.c#5 integrate
.. //depot/projects/nsched/sys/netinet/tcp_input.c#4 integrate
.. //depot/projects/nsched/sys/netinet/tcp_subr.c#4 integrate
.. //depot/projects/nsched/sys/netinet/tcp_syncache.c#3 integrate
.. //depot/projects/nsched/sys/netinet/tcp_usrreq.c#3 integrate
.. //depot/projects/nsched/sys/netinet/udp_usrreq.c#4 integrate
.. //depot/projects/nsched/sys/netinet6/in6_pcb.c#3 integrate
.. //depot/projects/nsched/sys/netinet6/ip6_input.c#4 integrate
.. //depot/projects/nsched/sys/netipx/ipx_pcb.c#2 integrate
.. //depot/projects/nsched/sys/netipx/ipx_usrreq.c#2 integrate
.. //depot/projects/nsched/sys/netipx/spx_usrreq.c#2 integrate
.. //depot/projects/nsched/sys/netnatm/natm.c#2 integrate
.. //depot/projects/nsched/sys/netncp/ncp_mod.c#3 integrate
.. //depot/projects/nsched/sys/netsmb/smb_dev.c#3 integrate
.. //depot/projects/nsched/sys/netsmb/smb_trantcp.c#2 integrate
.. //depot/projects/nsched/sys/nfs4client/nfs4_dev.c#2 integrate
.. //depot/projects/nsched/sys/nfsclient/bootp_subr.c#2 integrate
.. //depot/projects/nsched/sys/nfsclient/krpc_subr.c#2 integrate
.. //depot/projects/nsched/sys/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/nsched/sys/nfsclient/nfs_socket.c#3 integrate
.. //depot/projects/nsched/sys/opencrypto/cryptodev.c#3 integrate
.. //depot/projects/nsched/sys/pc98/conf/NOTES#5 integrate
.. //depot/projects/nsched/sys/pc98/i386/machdep.c#4 integrate
.. //depot/projects/nsched/sys/pc98/pc98/fd.c#4 integrate
.. //depot/projects/nsched/sys/pc98/pc98/mse.c#3 integrate
.. //depot/projects/nsched/sys/pc98/pc98/olpt.c#3 integrate
.. //depot/projects/nsched/sys/pc98/pc98/pc98gdc.c#3 integrate
.. //depot/projects/nsched/sys/pc98/pc98/sio.c#6 integrate
.. //depot/projects/nsched/sys/pc98/pc98/wd_cd.c#2 integrate
.. //depot/projects/nsched/sys/pccard/pccard.c#2 integrate
.. //depot/projects/nsched/sys/pccard/slot.h#2 integrate
.. //depot/projects/nsched/sys/pci/agp.c#4 integrate
.. //depot/projects/nsched/sys/pci/agppriv.h#3 integrate
.. //depot/projects/nsched/sys/pci/if_mn.c#3 integrate
.. //depot/projects/nsched/sys/pci/if_ti.c#3 integrate
.. //depot/projects/nsched/sys/pci/if_tireg.h#2 integrate
.. //depot/projects/nsched/sys/pci/xrpu.c#3 integrate
.. //depot/projects/nsched/sys/powerpc/ofw/ofw_syscons.h#2 integrate
.. //depot/projects/nsched/sys/security/mac/mac_socket.c#2 integrate
.. //depot/projects/nsched/sys/security/mac/mac_vfs.c#2 integrate
.. //depot/projects/nsched/sys/security/mac_biba/mac_biba.c#2 integrate
.. //depot/projects/nsched/sys/security/mac_lomac/mac_lomac.c#2 integrate
.. //depot/projects/nsched/sys/security/mac_mls/mac_mls.c#2 integrate
.. //depot/projects/nsched/sys/security/mac_stub/mac_stub.c#2 integrate
.. //depot/projects/nsched/sys/security/mac_test/mac_test.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/creator/creator.h#2 integrate
.. //depot/projects/nsched/sys/sparc64/creator/creator_upa.c#3 integrate
.. //depot/projects/nsched/sys/sparc64/include/cpu.h#3 integrate
.. //depot/projects/nsched/sys/sparc64/sbus/lsi64854.c#1 branch
.. //depot/projects/nsched/sys/sparc64/sbus/lsi64854reg.h#1 branch
.. //depot/projects/nsched/sys/sparc64/sbus/lsi64854var.h#1 branch
.. //depot/projects/nsched/sys/sparc64/sparc64/mem.c#4 integrate
.. //depot/projects/nsched/sys/sys/_lock.h#2 integrate
.. //depot/projects/nsched/sys/sys/_types.h#2 integrate
.. //depot/projects/nsched/sys/sys/bio.h#3 integrate
.. //depot/projects/nsched/sys/sys/conf.h#4 integrate
.. //depot/projects/nsched/sys/sys/gmon.h#4 integrate
.. //depot/projects/nsched/sys/sys/linedisc.h#2 integrate
.. //depot/projects/nsched/sys/sys/mac.h#3 integrate
.. //depot/projects/nsched/sys/sys/mac_policy.h#3 integrate
.. //depot/projects/nsched/sys/sys/mbuf.h#6 integrate
.. //depot/projects/nsched/sys/sys/mount.h#4 integrate
.. //depot/projects/nsched/sys/sys/param.h#5 integrate
.. //depot/projects/nsched/sys/sys/proc.h#13 integrate
.. //depot/projects/nsched/sys/sys/resource.h#3 integrate
.. //depot/projects/nsched/sys/sys/sched.h#6 integrate
.. //depot/projects/nsched/sys/sys/socketvar.h#4 integrate
.. //depot/projects/nsched/sys/sys/stat.h#3 integrate
.. //depot/projects/nsched/sys/sys/sysctl.h#4 integrate
.. //depot/projects/nsched/sys/sys/systm.h#4 integrate
.. //depot/projects/nsched/sys/sys/tty.h#4 integrate
.. //depot/projects/nsched/sys/sys/types.h#4 integrate
.. //depot/projects/nsched/sys/sys/vnode.h#4 integrate
.. //depot/projects/nsched/sys/ufs/ffs/ffs_alloc.c#5 integrate
.. //depot/projects/nsched/sys/ufs/ffs/ffs_snapshot.c#3 integrate
.. //depot/projects/nsched/sys/ufs/ffs/ffs_vfsops.c#4 integrate
.. //depot/projects/nsched/sys/ufs/ufs/dinode.h#2 integrate
.. //depot/projects/nsched/sys/ufs/ufs/ufs_extern.h#3 integrate
.. //depot/projects/nsched/sys/ufs/ufs/ufs_ihash.c#3 integrate
.. //depot/projects/nsched/sys/ufs/ufs/ufsmount.h#3 integrate
.. //depot/projects/nsched/sys/vm/device_pager.c#4 integrate
.. //depot/projects/nsched/sys/vm/swap_pager.c#3 integrate
.. //depot/projects/nsched/sys/vm/vm_contig.c#3 integrate
.. //depot/projects/nsched/sys/vm/vm_glue.c#4 integrate
.. //depot/projects/nsched/sys/vm/vm_pageout.c#3 integrate
Differences ...
==== //depot/projects/nsched/sys/alpha/alpha/mem.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.49 2004/06/03 05:58:27 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.50 2004/06/16 09:46:26 phk Exp $");
/*
* Memory special file
@@ -67,9 +67,9 @@
#include <vm/pmap.h>
#include <vm/vm_extern.h>
-static dev_t memdev, kmemdev;
+static struct cdev *memdev, *kmemdev;
#ifdef PERFMON
-static dev_t perfdev;
+static struct cdev *perfdev;
#endif /* PERFMON */
static d_open_t mmopen;
@@ -95,7 +95,7 @@
struct mem_range_softc mem_range_softc;
static int
-mmclose(dev_t dev, int flags, int fmt, struct thread *td)
+mmclose(struct cdev *dev, int flags, int fmt, struct thread *td)
{
switch (minor(dev)) {
#ifdef PERFMON
@@ -109,7 +109,7 @@
}
static int
-mmopen(dev_t dev, int flags, int fmt, struct thread *td)
+mmopen(struct cdev *dev, int flags, int fmt, struct thread *td)
{
int error;
@@ -136,7 +136,7 @@
/*ARGSUSED*/
static int
-mmrw(dev_t dev, struct uio *uio, int flags)
+mmrw(struct cdev *dev, struct uio *uio, int flags)
{
vm_offset_t o, v;
int c = 0;
@@ -219,7 +219,7 @@
* instead of going through read/write *
\*******************************************************/
static int
-memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
+memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
{
/*
* /dev/mem is the only one that makes sense through this
@@ -240,7 +240,7 @@
}
static int
-mmioctl(dev_t dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td)
+mmioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td)
{
switch(minor(dev)) {
#ifdef PERFMON
==== //depot/projects/nsched/sys/alpha/alpha/pmap.c#5 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.147 2004/06/10 04:30:59 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.150 2004/06/15 19:28:39 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -172,7 +172,6 @@
#include <vm/vm_pageout.h>
#include <vm/vm_pager.h>
#include <vm/uma.h>
-#include <vm/uma_int.h>
#include <sys/user.h>
@@ -555,52 +554,6 @@
return 0;
}
-void *
-uma_small_alloc(uma_zone_t zone, int bytes, u_int8_t *flags, int wait)
-{
- static vm_pindex_t color;
- vm_page_t m;
- int pflags;
- void *va;
-
- *flags = UMA_SLAB_PRIV;
-
- if ((wait & (M_NOWAIT|M_USE_RESERVE)) == M_NOWAIT)
- pflags = VM_ALLOC_INTERRUPT;
- else
- pflags = VM_ALLOC_SYSTEM;
-
- if (wait & M_ZERO)
- pflags |= VM_ALLOC_ZERO;
-
- for (;;) {
- m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ);
- if (m == NULL) {
- if (wait & M_NOWAIT)
- return (NULL);
- else
- VM_WAIT;
- } else
- break;
- }
-
- va = (void *)ALPHA_PHYS_TO_K0SEG(m->phys_addr);
- if ((wait & M_ZERO) && (m->flags & PG_ZERO) == 0)
- bzero(va, PAGE_SIZE);
- return (va);
-}
-
-void
-uma_small_free(void *mem, int size, u_int8_t flags)
-{
- vm_page_t m;
-
- m = PHYS_TO_VM_PAGE(ALPHA_K0SEG_TO_PHYS((vm_offset_t)mem));
- vm_page_lock_queues();
- vm_page_free(m);
- vm_page_unlock_queues();
-}
-
/*
* Initialize the pmap module.
* Called by vm_init, to initialize any structures that the pmap
@@ -1472,12 +1425,6 @@
return uma_zalloc(pvzone, M_NOWAIT);
}
-/*
- * If it is the first entry on the list, it is actually
- * in the header and we must copy the following entry up
- * to the header. Otherwise we must search the list for
- * the entry. In either case we free the now unused entry.
- */
static int
pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va)
==== //depot/projects/nsched/sys/alpha/alpha/promcons.c#3 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.38 2004/06/04 16:02:48 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/promcons.c,v 1.39 2004/06/16 09:46:26 phk Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -86,7 +86,7 @@
int
promopen(dev, flag, mode, td)
- dev_t dev;
+ struct cdev *dev;
int flag, mode;
struct thread *td;
{
@@ -137,7 +137,7 @@
int
promclose(dev, flag, mode, td)
- dev_t dev;
+ struct cdev *dev;
int flag, mode;
struct thread *td;
{
==== //depot/projects/nsched/sys/alpha/include/cpu.h#3 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.37 2004/04/05 21:00:50 imp Exp $ */
+/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.38 2004/06/16 09:46:26 phk Exp $ */
/* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
/*
@@ -66,7 +66,7 @@
/*
* CTL_MACHDEP definitions.
*/
-#define CPU_CONSDEV 1 /* dev_t: console terminal device */
+#define CPU_CONSDEV 1 /* struct cdev *: console terminal device */
#define CPU_ROOT_DEVICE 2 /* string: root device name */
#define CPU_UNALIGNED_PRINT 3 /* int: print unaligned accesses */
#define CPU_UNALIGNED_FIX 4 /* int: fix unaligned accesses */
==== //depot/projects/nsched/sys/alpha/tlsb/zs_tlsb.c#3 (text+ko) ====
@@ -31,7 +31,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.44 2004/06/04 16:02:48 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/tlsb/zs_tlsb.c,v 1.45 2004/06/16 09:46:27 phk Exp $");
#include "opt_ddb.h"
@@ -258,7 +258,7 @@
static int
-zsopen(dev_t dev, int flag, int mode, struct thread *td)
+zsopen(struct cdev *dev, int flag, int mode, struct thread *td)
{
struct zs_softc *sc = ZS_SOFTC(minor(dev));
struct tty *tp;
@@ -305,7 +305,7 @@
}
static int
-zsclose(dev_t dev, int flag, int mode, struct thread *td)
+zsclose(struct cdev *dev, int flag, int mode, struct thread *td)
{
struct zs_softc *sc = ZS_SOFTC(minor(dev));
struct tty *tp;
==== //depot/projects/nsched/sys/amd64/amd64/mem.c#4 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.115 2004/06/03 05:58:30 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mem.c,v 1.116 2004/06/16 09:46:27 phk Exp $");
/*
* Memory special file
@@ -68,7 +68,7 @@
#include <vm/pmap.h>
#include <vm/vm_extern.h>
-static dev_t memdev, kmemdev, iodev;
+static struct cdev *memdev, *kmemdev, *iodev;
static d_open_t mmopen;
static d_close_t mmclose;
@@ -95,7 +95,7 @@
struct mem_range_softc mem_range_softc;
static int
-mmclose(dev_t dev, int flags, int fmt, struct thread *td)
+mmclose(struct cdev *dev, int flags, int fmt, struct thread *td)
{
switch (minor(dev)) {
case 14:
@@ -105,7 +105,7 @@
}
static int
-mmopen(dev_t dev, int flags, int fmt, struct thread *td)
+mmopen(struct cdev *dev, int flags, int fmt, struct thread *td)
{
int error;
@@ -133,7 +133,7 @@
/*ARGSUSED*/
static int
-mmrw(dev_t dev, struct uio *uio, int flags)
+mmrw(struct cdev *dev, struct uio *uio, int flags)
{
int o;
u_long c = 0, v;
@@ -214,7 +214,7 @@
* instead of going through read/write *
\*******************************************************/
static int
-memmmap(dev_t dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
+memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
{
switch (minor(dev))
{
@@ -242,7 +242,7 @@
* and mem_range_attr_set.
*/
static int
-mmioctl(dev_t dev, u_long cmd, caddr_t data, int flags, struct thread *td)
+mmioctl(struct cdev *dev, u_long cmd, caddr_t data, int flags, struct thread *td)
{
int nd, error = 0;
struct mem_range_op *mo = (struct mem_range_op *)data;
==== //depot/projects/nsched/sys/amd64/amd64/pmap.c#8 (text+ko) ====
@@ -75,7 +75,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.466 2004/06/08 02:20:40 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.474 2004/06/16 07:51:19 alc Exp $");
/*
* Manages physical address maps.
@@ -142,7 +142,6 @@
#include <machine/smp.h>
#endif
-#define PMAP_KEEP_PDIRS
#ifndef PMAP_SHPGPERPROC
#define PMAP_SHPGPERPROC 200
#endif
@@ -208,8 +207,7 @@
static PMAP_INLINE void free_pv_entry(pv_entry_t pv);
static pv_entry_t get_pv_entry(void);
-static void pmap_clear_ptes(vm_page_t m, int bit)
- __always_inline;
+static void pmap_clear_ptes(vm_page_t m, int bit);
static int pmap_remove_pte(pmap_t pmap, pt_entry_t *ptq, vm_offset_t sva);
static void pmap_remove_page(struct pmap *pmap, vm_offset_t va);
@@ -466,6 +464,7 @@
/*
* Initialize the kernel pmap (which is statically allocated).
*/
+ PMAP_LOCK_INIT(kernel_pmap);
kernel_pmap->pm_pml4 = (pdp_entry_t *) (KERNBASE + KPML4phys);
kernel_pmap->pm_active = -1; /* don't allow deactivation */
TAILQ_INIT(&kernel_pmap->pm_pvlist);
@@ -775,19 +774,23 @@
if (pmap == 0)
return 0;
+ PMAP_LOCK(pmap);
pdep = pmap_pde(pmap, va);
if (pdep) {
pde = *pdep;
if (pde) {
if ((pde & PG_PS) != 0) {
rtval = (pde & ~PDRMASK) | (va & PDRMASK);
+ PMAP_UNLOCK(pmap);
return rtval;
}
pte = pmap_pte(pmap, va);
rtval = ((*pte & PG_FRAME) | (va & PAGE_MASK));
+ PMAP_UNLOCK(pmap);
return rtval;
}
}
+ PMAP_UNLOCK(pmap);
return 0;
}
@@ -1037,6 +1040,7 @@
struct pmap *pmap;
{
+ PMAP_LOCK_INIT(pmap);
pmap->pm_pml4 = (pml4_entry_t *)(KERNBASE + KPML4phys);
pmap->pm_active = 0;
TAILQ_INIT(&pmap->pm_pvlist);
@@ -1057,6 +1061,8 @@
vm_page_t pml4pg;
static vm_pindex_t color;
+ PMAP_LOCK_INIT(pmap);
+
/*
* allocate the page directory page
*/
@@ -1308,6 +1314,7 @@
atomic_subtract_int(&cnt.v_wire_count, 1);
vm_page_free_zero(m);
vm_page_unlock_queues();
+ PMAP_LOCK_DESTROY(pmap);
}
static int
@@ -1336,13 +1343,11 @@
void
pmap_growkernel(vm_offset_t addr)
{
- int s;
vm_paddr_t paddr;
vm_page_t nkpg;
pd_entry_t *pde, newpdir;
pdp_entry_t newpdp;
- s = splhigh();
mtx_assert(&kernel_map->system_mtx, MA_OWNED);
if (kernel_vm_end == 0) {
kernel_vm_end = KERNBASE;
@@ -1390,7 +1395,6 @@
kernel_vm_end = (kernel_vm_end + PAGE_SIZE * NPTEPG) & ~(PAGE_SIZE * NPTEPG - 1);
}
- splx(s);
}
@@ -1427,21 +1431,14 @@
return uma_zalloc(pvzone, M_NOWAIT);
}
-/*
- * If it is the first entry on the list, it is actually
- * in the header and we must copy the following entry up
- * to the header. Otherwise we must search the list for
- * the entry. In either case we free the now unused entry.
- */
static int
pmap_remove_entry(pmap_t pmap, vm_page_t m, vm_offset_t va)
{
pv_entry_t pv;
int rtval;
- int s;
- s = splvm();
+ PMAP_LOCK_ASSERT(pmap, MA_OWNED);
mtx_assert(&vm_page_queue_mtx, MA_OWNED);
if (m->md.pv_list_count < pmap->pm_stats.resident_count) {
TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
@@ -1467,7 +1464,6 @@
free_pv_entry(pv);
}
- splx(s);
return rtval;
}
@@ -1479,10 +1475,8 @@
pmap_insert_entry(pmap_t pmap, vm_offset_t va, vm_page_t mpte, vm_page_t m)
{
- int s;
pv_entry_t pv;
- s = splvm();
pv = get_pv_entry();
pv->pv_va = va;
pv->pv_pmap = pmap;
@@ -1494,7 +1488,6 @@
m->md.pv_list_count++;
vm_page_unlock_queues();
- splx(s);
}
/*
@@ -1506,6 +1499,7 @@
pt_entry_t oldpte;
vm_page_t m, mpte;
+ PMAP_LOCK_ASSERT(pmap, MA_OWNED);
oldpte = pte_load_clear(ptq);
if (oldpte & PG_W)
pmap->pm_stats.wired_count -= 1;
@@ -1546,6 +1540,7 @@
{
pt_entry_t *pte;
+ PMAP_LOCK_ASSERT(pmap, MA_OWNED);
pte = pmap_pte(pmap, va);
if (pte == NULL || (*pte & PG_V) == 0)
return;
@@ -1572,8 +1567,12 @@
if (pmap == NULL)
return;
+ /*
+ * Perform an unsynchronized read. This is, however, safe.
+ */
if (pmap->pm_stats.resident_count == 0)
return;
+ PMAP_LOCK(pmap);
/*
* special handling of removing one page. a very
@@ -1584,6 +1583,7 @@
pde = pmap_pde(pmap, sva);
if (pde && (*pde & PG_PS) == 0) {
pmap_remove_page(pmap, sva);
+ PMAP_UNLOCK(pmap);
return;
}
}
@@ -1654,6 +1654,7 @@
if (anyvalid)
pmap_invalidate_all(pmap);
+ PMAP_UNLOCK(pmap);
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list