Date: Mon, 11 Nov 2002 13:21:02 -0800 (PST) From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 20980 for review Message-ID: <200211112121.gABLL20j095646@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=20980 Change 20980 by jhb@jhb_laptop on 2002/11/11 13:20:21 IFC @20971. Affected files ... .. //depot/projects/smpng/sys/alpha/alpha/atomic.s#3 integrate .. //depot/projects/smpng/sys/alpha/alpha/machdep.c#50 integrate .. //depot/projects/smpng/sys/alpha/alpha/pmap.c#39 integrate .. //depot/projects/smpng/sys/alpha/alpha/prom.c#9 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#2 integrate .. //depot/projects/smpng/sys/alpha/include/atomic.h#7 integrate .. //depot/projects/smpng/sys/alpha/include/bus.h#5 integrate .. //depot/projects/smpng/sys/alpha/include/vmparam.h#3 integrate .. //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#10 integrate .. //depot/projects/smpng/sys/bluetooth/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/common/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/common/ng_bluetooth.c#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c.4#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c_firmware.h#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/bt3c/ng_bt3c_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4.4#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4.c#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4_prse.h#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/h4/ng_h4_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/ng_ubt.4#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/ng_ubt.c#1 branch .. //depot/projects/smpng/sys/bluetooth/drivers/ubt/ng_ubt_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci.4#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_cmds.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_cmds.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_evnt.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_evnt.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_main.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_misc.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_misc.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_prse.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_ulpi.c#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_ulpi.h#1 branch .. //depot/projects/smpng/sys/bluetooth/hci/ng_hci_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_bluetooth.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_bt3c.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_btsocket.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_btsocket_hci_raw.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_btsocket_l2cap.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_h4.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_hci.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_l2cap.h#1 branch .. //depot/projects/smpng/sys/bluetooth/include/ng_ubt.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap.4#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_cmds.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_cmds.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_evnt.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_evnt.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_llpi.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_llpi.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_main.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_misc.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_misc.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_prse.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_ulpi.c#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_ulpi.h#1 branch .. //depot/projects/smpng/sys/bluetooth/l2cap/ng_l2cap_var.h#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/Makefile#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/TODO#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket.4#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket.c#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket_hci_raw.c#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket_l2cap.c#1 branch .. //depot/projects/smpng/sys/bluetooth/socket/ng_btsocket_l2cap_raw.c#1 branch .. //depot/projects/smpng/sys/boot/forth/loader.conf#13 integrate .. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#5 integrate .. //depot/projects/smpng/sys/boot/ofw/common/main.c#3 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/Makefile#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/devicename.c#4 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#5 integrate .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_devsearch.c#3 delete .. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_disk.c#6 integrate .. //depot/projects/smpng/sys/boot/powerpc/loader/metadata.c#2 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/Makefile#12 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/main.c#11 integrate .. //depot/projects/smpng/sys/boot/sparc64/loader/metadata.c#8 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_ses.c#5 integrate .. //depot/projects/smpng/sys/compat/pecoff/imgact_pecoff.c#16 integrate .. //depot/projects/smpng/sys/conf/NOTES#28 integrate .. //depot/projects/smpng/sys/conf/files#55 integrate .. //depot/projects/smpng/sys/conf/files.i386#34 integrate .. //depot/projects/smpng/sys/conf/files.pc98#34 integrate .. //depot/projects/smpng/sys/conf/kern.post.mk#17 integrate .. //depot/projects/smpng/sys/conf/kmod.mk#16 integrate .. //depot/projects/smpng/sys/conf/majors#17 integrate .. //depot/projects/smpng/sys/crypto/sha2/sha2.c#4 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#18 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#35 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_acad.c#8 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_cmbat.c#11 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#3 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi_pcib.c#14 integrate .. //depot/projects/smpng/sys/dev/acpica/acpivar.h#21 integrate .. //depot/projects/smpng/sys/dev/amr/amr.c#10 integrate .. //depot/projects/smpng/sys/dev/amr/amr_cam.c#3 integrate .. //depot/projects/smpng/sys/dev/amr/amr_compat.h#3 integrate .. //depot/projects/smpng/sys/dev/amr/amr_disk.c#5 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/amr/amr_tables.h#3 integrate .. //depot/projects/smpng/sys/dev/amr/amrio.h#3 integrate .. //depot/projects/smpng/sys/dev/amr/amrreg.h#5 integrate .. //depot/projects/smpng/sys/dev/amr/amrvar.h#6 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#24 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#14 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#25 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#12 integrate .. //depot/projects/smpng/sys/dev/awi/awi.c#10 integrate .. //depot/projects/smpng/sys/dev/bge/if_bgereg.h#9 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_core.c#7 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#4 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#11 integrate .. //depot/projects/smpng/sys/dev/cardbus/cardbus_cis.c#8 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_scsi.c#2 integrate .. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#4 integrate .. //depot/projects/smpng/sys/dev/em/README#4 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#12 integrate .. //depot/projects/smpng/sys/dev/em/if_em.h#9 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.c#5 integrate .. //depot/projects/smpng/sys/dev/em/if_em_hw.h#5 integrate .. //depot/projects/smpng/sys/dev/em/if_em_osdep.h#8 integrate .. //depot/projects/smpng/sys/dev/fb/vga.c#9 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#3 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#2 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#4 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#20 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxpvar.h#6 integrate .. //depot/projects/smpng/sys/dev/gfb/gfb_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/gx/if_gxvar.h#4 integrate .. //depot/projects/smpng/sys/dev/hea/eni_buffer.c#7 integrate .. //depot/projects/smpng/sys/dev/hea/eni_init.c#2 integrate .. //depot/projects/smpng/sys/dev/hea/eni_receive.c#4 integrate .. //depot/projects/smpng/sys/dev/hea/eni_transmit.c#4 integrate .. //depot/projects/smpng/sys/dev/hea/eni_vcm.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_output.c#5 integrate .. //depot/projects/smpng/sys/dev/hfa/fore_receive.c#5 integrate .. //depot/projects/smpng/sys/dev/ida/ida.c#3 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/mcd/mcd.c#2 integrate .. //depot/projects/smpng/sys/dev/mcd/mcdvar.h#2 integrate .. //depot/projects/smpng/sys/dev/musycc/musycc.c#2 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#6 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#17 integrate .. //depot/projects/smpng/sys/dev/nge/if_ngereg.h#5 integrate .. //depot/projects/smpng/sys/dev/pccard/card_if.m#8 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#22 integrate .. //depot/projects/smpng/sys/dev/pci/isa_pci.c#3 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/pcfclock.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppb_msq.h#2 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#8 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#3 integrate .. //depot/projects/smpng/sys/dev/scd/scd.c#2 integrate .. //depot/projects/smpng/sys/dev/scd/scd_isa.c#1 branch .. //depot/projects/smpng/sys/dev/scd/scdreg.h#2 integrate .. //depot/projects/smpng/sys/dev/scd/scdvar.h#1 branch .. //depot/projects/smpng/sys/dev/si/si_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/sio/sio_puc.c#5 integrate .. //depot/projects/smpng/sys/dev/snp/snp.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/usb/uaudioreg.h#2 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#6 integrate .. //depot/projects/smpng/sys/dev/sr/if_srregs.h#2 integrate .. //depot/projects/smpng/sys/dev/sym/sym_defs.h#3 integrate .. //depot/projects/smpng/sys/dev/tdfx/tdfx_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/tga/tga_pci.c#2 integrate .. //depot/projects/smpng/sys/dev/twe/twe_compat.h#2 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#3 integrate .. //depot/projects/smpng/sys/dev/usb/ufm.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/ugen.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/ulpt.c#10 integrate .. //depot/projects/smpng/sys/dev/usb/umass.c#17 integrate .. //depot/projects/smpng/sys/dev/usb/usb.h#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumdaemon.c#4 integrate .. //depot/projects/smpng/sys/dev/vinum/vinuminterrupt.c#3 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrequest.c#7 integrate .. //depot/projects/smpng/sys/dev/vinum/vinumrevive.c#5 integrate .. //depot/projects/smpng/sys/dev/wds/wd7000.c#2 integrate .. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#15 integrate .. //depot/projects/smpng/sys/fs/msdosfs/denode.h#4 integrate .. //depot/projects/smpng/sys/fs/smbfs/smbfs_smb.c#6 integrate .. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#19 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.c#2 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde.h#2 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_crypt.c#3 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_lock.c#2 integrate .. //depot/projects/smpng/sys/geom/bde/g_bde_work.c#2 integrate .. //depot/projects/smpng/sys/geom/geom.h#15 integrate .. //depot/projects/smpng/sys/geom/geom_bsd.c#16 integrate .. //depot/projects/smpng/sys/geom/geom_ctl.c#2 integrate .. //depot/projects/smpng/sys/geom/geom_dev.c#14 integrate .. //depot/projects/smpng/sys/geom/geom_dump.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_event.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_gpt.c#6 integrate .. //depot/projects/smpng/sys/geom/geom_io.c#11 integrate .. //depot/projects/smpng/sys/geom/geom_mbr.c#13 integrate .. //depot/projects/smpng/sys/geom/geom_pc98.c#9 integrate .. //depot/projects/smpng/sys/geom/geom_subr.c#15 integrate .. //depot/projects/smpng/sys/i386/conf/NOTES#47 integrate .. //depot/projects/smpng/sys/i386/i386/exception.s#12 integrate .. //depot/projects/smpng/sys/i386/i386/genassym.c#18 integrate .. //depot/projects/smpng/sys/i386/i386/machdep.c#50 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#27 integrate .. //depot/projects/smpng/sys/i386/i386/trap.c#47 integrate .. //depot/projects/smpng/sys/i386/i386/vm86.c#13 integrate .. //depot/projects/smpng/sys/i386/i386/vm86bios.s#4 integrate .. //depot/projects/smpng/sys/i386/include/pcb.h#9 integrate .. //depot/projects/smpng/sys/i386/include/reg.h#7 integrate .. //depot/projects/smpng/sys/i386/include/vm86.h#5 integrate .. //depot/projects/smpng/sys/i386/isa/gpib.c#5 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#29 integrate .. //depot/projects/smpng/sys/i386/isa/scd.c#9 delete .. //depot/projects/smpng/sys/i386/isa/scdreg.h#2 delete .. //depot/projects/smpng/sys/i386/isa/spkr.c#8 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#23 integrate .. //depot/projects/smpng/sys/i386/pci/pci_cfgreg.c#15 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC#25 integrate .. //depot/projects/smpng/sys/ia64/conf/GENERIC.hints#3 integrate .. //depot/projects/smpng/sys/ia64/ia32/syscalls.master#5 integrate .. //depot/projects/smpng/sys/ia64/ia64/exception.s#21 integrate .. //depot/projects/smpng/sys/ia64/ia64/genassym.c#18 integrate .. //depot/projects/smpng/sys/ia64/ia64/locore.s#14 integrate .. //depot/projects/smpng/sys/ia64/ia64/machdep.c#48 integrate .. //depot/projects/smpng/sys/ia64/ia64/pmap.c#38 integrate .. //depot/projects/smpng/sys/ia64/ia64/swtch.s#12 integrate .. //depot/projects/smpng/sys/ia64/ia64/vm_machdep.c#19 integrate .. //depot/projects/smpng/sys/ia64/include/pcb.h#7 integrate .. //depot/projects/smpng/sys/ia64/include/setjmp.h#5 integrate .. //depot/projects/smpng/sys/ia64/include/vmparam.h#4 integrate .. //depot/projects/smpng/sys/isa/fd.c#14 integrate .. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#17 integrate .. //depot/projects/smpng/sys/kern/imgact_elf.c#23 integrate .. //depot/projects/smpng/sys/kern/imgact_shell.c#3 integrate .. //depot/projects/smpng/sys/kern/init_sysent.c#22 integrate .. //depot/projects/smpng/sys/kern/kern_acct.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_environment.c#9 integrate .. //depot/projects/smpng/sys/kern/kern_event.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_exec.c#46 integrate .. //depot/projects/smpng/sys/kern/kern_lockf.c#11 integrate .. //depot/projects/smpng/sys/kern/kern_mac.c#8 integrate .. //depot/projects/smpng/sys/kern/kern_malloc.c#15 integrate .. //depot/projects/smpng/sys/kern/kern_mib.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#37 integrate .. //depot/projects/smpng/sys/kern/kern_tc.c#17 integrate .. //depot/projects/smpng/sys/kern/kern_thread.c#12 integrate .. //depot/projects/smpng/sys/kern/kern_time.c#19 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#15 integrate .. //depot/projects/smpng/sys/kern/subr_trap.c#43 integrate .. //depot/projects/smpng/sys/kern/subr_witness.c#64 integrate .. //depot/projects/smpng/sys/kern/sys_socket.c#13 integrate .. //depot/projects/smpng/sys/kern/syscalls.c#22 integrate .. //depot/projects/smpng/sys/kern/syscalls.master#21 integrate .. //depot/projects/smpng/sys/kern/uipc_socket.c#29 integrate .. //depot/projects/smpng/sys/kern/uipc_socket2.c#21 integrate .. //depot/projects/smpng/sys/kern/vfs_aio.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#30 integrate .. //depot/projects/smpng/sys/kern/vfs_cluster.c#14 integrate .. //depot/projects/smpng/sys/kern/vfs_mount.c#8 integrate .. //depot/projects/smpng/sys/libkern/qsort.c#3 integrate .. //depot/projects/smpng/sys/modules/Makefile#37 integrate .. //depot/projects/smpng/sys/modules/Makefile.inc#3 integrate .. //depot/projects/smpng/sys/modules/aac/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/aic/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/ahc/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/aic7xxx/ahd/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/aic7xxx/aicasm/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/apm/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/atspeaker/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/bktr/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/cam/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/drm/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/ed/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/ep/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/fdc/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/fe/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/firewire/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/firewire/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/hfa/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/i2c/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/i2c/controllers/Makefile.inc#1 branch .. //depot/projects/smpng/sys/modules/isp/Makefile#1 branch .. //depot/projects/smpng/sys/modules/lnc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/lomac/Makefile.inc#2 integrate .. //depot/projects/smpng/sys/modules/mpt/Makefile#1 branch .. //depot/projects/smpng/sys/modules/msdosfs/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/netgraph/fec/Makefile#1 branch .. //depot/projects/smpng/sys/modules/netgraph/fec/sample_startup#1 branch .. //depot/projects/smpng/sys/modules/netgraph/source/Makefile#1 branch .. //depot/projects/smpng/sys/modules/nfsserver/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/oldcard/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/pcspeaker/Makefile#1 branch .. //depot/projects/smpng/sys/modules/pmc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/scd/Makefile#1 branch .. //depot/projects/smpng/sys/modules/sound/driver/mss/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/sound/driver/sbc/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/splash/bmp/Makefile#3 integrate .. //depot/projects/smpng/sys/modules/splash/bmp/splash_bmp.c#3 integrate .. //depot/projects/smpng/sys/modules/splash/pcx/splash_pcx.c#2 integrate .. //depot/projects/smpng/sys/modules/syscons/apm/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/daemon/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/dragon/Makefile#2 integrate .. //depot/projects/smpng/sys/modules/syscons/fire/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/syscons/rain/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/snake/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/star/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/syscons/warp/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/sysvipc/Makefile.inc#1 branch .. //depot/projects/smpng/sys/net/if_vlan.c#12 integrate .. //depot/projects/smpng/sys/net/radix.c#5 integrate .. //depot/projects/smpng/sys/net/zlib.c#6 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.c#8 integrate .. //depot/projects/smpng/sys/netatm/atm_cm.h#5 integrate .. //depot/projects/smpng/sys/netatm/atm_device.c#5 integrate .. //depot/projects/smpng/sys/netatm/atm_if.c#7 integrate .. //depot/projects/smpng/sys/netatm/atm_if.h#7 integrate .. //depot/projects/smpng/sys/netatm/atm_signal.c#4 integrate .. //depot/projects/smpng/sys/netatm/atm_stack.h#3 integrate .. //depot/projects/smpng/sys/netatm/atm_subr.c#11 integrate .. //depot/projects/smpng/sys/netatm/atm_var.h#9 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_if.c#5 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_load.c#4 integrate .. //depot/projects/smpng/sys/netatm/ipatm/ipatm_var.h#4 integrate .. //depot/projects/smpng/sys/netatm/port.h#5 integrate .. //depot/projects/smpng/sys/netatm/spans/spans_kxdr.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_sigaa.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/q2110_sigcpcs.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_sigaa.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/qsaal1_sigcpcs.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_lower.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_upper.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscf_uni_var.h#3 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_lower.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_pdu.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_sigaa.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_sigcpcs.c#2 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_subr.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_upper.c#4 integrate .. //depot/projects/smpng/sys/netatm/uni/sscop_var.h#4 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_decode.c#5 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_encode.c#3 integrate .. //depot/projects/smpng/sys/netatm/uni/unisig_var.h#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_bridge.c#5 integrate .. //depot/projects/smpng/sys/netgraph/ng_fec.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_fec.h#1 branch .. //depot/projects/smpng/sys/netgraph/ng_one2many.c#4 integrate .. //depot/projects/smpng/sys/netgraph/ng_parse.c#8 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#7 integrate .. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#13 integrate .. //depot/projects/smpng/sys/netgraph/ng_source.c#1 branch .. //depot/projects/smpng/sys/netgraph/ng_source.h#1 branch .. //depot/projects/smpng/sys/netinet/in_pcb.c#30 integrate .. //depot/projects/smpng/sys/netinet/in_proto.c#6 integrate .. //depot/projects/smpng/sys/netinet/ip_mroute.c#18 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#29 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#25 integrate .. //depot/projects/smpng/sys/netinet/tcp_syncache.c#14 integrate .. //depot/projects/smpng/sys/netinet6/ip6_output.c#14 integrate .. //depot/projects/smpng/sys/netipsec/ipsec.h#2 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#2 integrate .. //depot/projects/smpng/sys/netipx/ipx_ip.c#5 integrate .. //depot/projects/smpng/sys/netncp/ncp_rq.c#3 integrate .. //depot/projects/smpng/sys/netsmb/smb_subr.c#8 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_serv.c#22 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_srvsubs.c#13 integrate .. //depot/projects/smpng/sys/nfsserver/nfs_syscalls.c#13 integrate .. //depot/projects/smpng/sys/nfsserver/nfsm_subs.h#6 integrate .. //depot/projects/smpng/sys/opencrypto/crypto.c#3 integrate .. //depot/projects/smpng/sys/opencrypto/cryptodev.c#3 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC#27 integrate .. //depot/projects/smpng/sys/pc98/conf/GENERIC.hints#5 integrate .. //depot/projects/smpng/sys/pc98/i386/machdep.c#45 integrate .. //depot/projects/smpng/sys/pc98/pc98/spkr.c#6 integrate .. //depot/projects/smpng/sys/pci/amd.c#3 integrate .. //depot/projects/smpng/sys/pci/if_mn.c#4 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#18 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#11 integrate .. //depot/projects/smpng/sys/pci/if_ti.c#17 integrate .. //depot/projects/smpng/sys/pci/if_tireg.h#3 integrate .. //depot/projects/smpng/sys/pci/intpm.c#5 integrate .. //depot/projects/smpng/sys/pci/viapm.c#2 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#29 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#8 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.h#4 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#3 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.h#2 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#2 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#8 integrate .. //depot/projects/smpng/sys/security/mac_mls/mac_mls.h#4 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#5 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#2 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.h#2 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#2 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#5 integrate .. //depot/projects/smpng/sys/sparc64/ebus/ebus.c#5 integrate .. //depot/projects/smpng/sys/sparc64/include/ofw_bus.h#3 integrate .. //depot/projects/smpng/sys/sparc64/include/pmap.h#16 integrate .. //depot/projects/smpng/sys/sparc64/include/ver.h#4 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#5 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.c#5 integrate .. //depot/projects/smpng/sys/sparc64/pci/ofw_pci.h#4 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#11 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/identcpu.c#9 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/machdep.c#39 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/ofw_bus.c#3 integrate .. //depot/projects/smpng/sys/sys/_label.h#3 integrate .. //depot/projects/smpng/sys/sys/gpt.h#3 integrate .. //depot/projects/smpng/sys/sys/imgact.h#8 integrate .. //depot/projects/smpng/sys/sys/mac.h#7 integrate .. //depot/projects/smpng/sys/sys/mac_policy.h#7 integrate .. //depot/projects/smpng/sys/sys/malloc.h#12 integrate .. //depot/projects/smpng/sys/sys/mchain.h#5 integrate .. //depot/projects/smpng/sys/sys/mount.h#17 integrate .. //depot/projects/smpng/sys/sys/param.h#31 integrate .. //depot/projects/smpng/sys/sys/proc.h#66 integrate .. //depot/projects/smpng/sys/sys/snoop.h#6 integrate .. //depot/projects/smpng/sys/sys/socketvar.h#25 integrate .. //depot/projects/smpng/sys/sys/syscall.h#22 integrate .. //depot/projects/smpng/sys/sys/syscall.mk#22 integrate .. //depot/projects/smpng/sys/sys/sysproto.h#24 integrate .. //depot/projects/smpng/sys/sys/time.h#10 integrate .. //depot/projects/smpng/sys/sys/uuid.h#2 integrate .. //depot/projects/smpng/sys/ufs/ufs/ufs_extattr.c#20 integrate .. //depot/projects/smpng/sys/vm/pmap.h#11 integrate .. //depot/projects/smpng/sys/vm/swap_pager.c#19 integrate .. //depot/projects/smpng/sys/vm/uma_core.c#22 integrate .. //depot/projects/smpng/sys/vm/uma_dbg.c#5 integrate .. //depot/projects/smpng/sys/vm/uma_int.h#12 integrate .. //depot/projects/smpng/sys/vm/vm_fault.c#17 integrate .. //depot/projects/smpng/sys/vm/vm_init.c#6 integrate .. //depot/projects/smpng/sys/vm/vm_map.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#20 integrate .. //depot/projects/smpng/sys/vm/vm_page.c#23 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#15 integrate .. //depot/projects/smpng/sys/vm/vm_pageout.c#18 integrate .. //depot/projects/smpng/sys/vm/vnode_pager.c#20 integrate Differences ... ==== //depot/projects/smpng/sys/alpha/alpha/atomic.s#3 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/atomic.s,v 1.5 2001/04/25 20:40:56 obrien Exp $ + * $FreeBSD: src/sys/alpha/alpha/atomic.s,v 1.6 2002/10/30 01:41:44 gallatin Exp $ */ #include <machine/asm.h> ==== //depot/projects/smpng/sys/alpha/alpha/machdep.c#50 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.187 2002/10/25 19:10:55 peter Exp $ + * $FreeBSD: src/sys/alpha/alpha/machdep.c,v 1.191 2002/11/09 16:19:13 des Exp $ */ /*- * Copyright (c) 1998 The NetBSD Foundation, Inc. @@ -192,7 +192,6 @@ long Maxmem = 0; long totalphysmem; /* total amount of physical memory in system */ -long physmem; /* physical memory used by NetBSD + some rsvd */ long resvmem; /* amount of memory reserved for PROM */ long unusedmem; /* amount of memory for OS that we don't use */ long unknownmem; /* amount of memory with an unknown use */ @@ -200,32 +199,6 @@ vm_offset_t phys_avail[10]; -static int -sysctl_hw_physmem(SYSCTL_HANDLER_ARGS) -{ - u_long val; - - val = alpha_ptob(physmem); - return (sysctl_handle_long(oidp, &val, 0, req)); -} - -SYSCTL_PROC(_hw, HW_PHYSMEM, physmem, CTLTYPE_ULONG | CTLFLAG_RD, - 0, 0, sysctl_hw_physmem, "LU", ""); - -static int -sysctl_hw_usermem(SYSCTL_HANDLER_ARGS) -{ - u_long val; - - val = alpha_ptob(physmem - cnt.v_wire_count); - return (sysctl_handle_long(oidp, &val, 0, req)); -} - -SYSCTL_PROC(_hw, HW_USERMEM, usermem, CTLTYPE_ULONG | CTLFLAG_RD, - 0, 0, sysctl_hw_usermem, "LU", ""); - -SYSCTL_ULONG(_hw, OID_AUTO, availpages, CTLFLAG_RD, &physmem, 0, ""); - /* must be 2 less so 0 0 can signal end of chunks */ #define PHYS_AVAIL_ARRAY_END ((sizeof(phys_avail) / sizeof(vm_offset_t)) - 2) @@ -266,7 +239,8 @@ #ifdef PERFMON perfmon_init(); #endif - printf("real memory = %ld (%ldK bytes)\n", alpha_ptob(Maxmem), alpha_ptob(Maxmem) / 1024); + printf("real memory = %ld (%ld MB)\n", alpha_ptob(Maxmem), + alpha_ptob(Maxmem) / 1048576); /* * Display any holes after the first chunk of extended memory. @@ -285,8 +259,8 @@ vm_ksubmap_init(&kmi); - printf("avail memory = %ld (%ldK bytes)\n", ptoa(cnt.v_free_count), - ptoa(cnt.v_free_count) / 1024); + printf("avail memory = %ld (%ld MB)\n", ptoa(cnt.v_free_count), + ptoa(cnt.v_free_count) / 1048576); /* * Set up buffers, so they can be used to read disk labels. @@ -1370,8 +1344,6 @@ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; - sf.sf_si.si_pid = p->p_pid; - sf.sf_si.si_uid = p->p_ucred->cr_uid; } else frame->tf_regs[FRAME_A1] = code; @@ -1453,11 +1425,6 @@ sfp = (struct sigframe *)(alpha_pal_rdusp() - rndfsize); PROC_UNLOCK(p); -#ifdef DEBUG - if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - printf("sendsig(%d): sig %d ssp %p usp %p\n", p->p_pid, - sig, &sf, sfp); -#endif /* save the floating-point state, if necessary, then copy it. */ alpha_fpstate_save(td, 1); sf.sf_uc.uc_mcontext.mc_ownedfp = td->td_md.md_flags & MDTD_FPUSED; @@ -1476,11 +1443,6 @@ * copy the frame out to userland. */ if (copyout((caddr_t)&sf, (caddr_t)sfp, sizeof(sf)) != 0) { -#ifdef DEBUG - if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - printf("sendsig(%d): copyout failed on sig %d\n", - p->p_pid, sig); -#endif /* * Process has trashed its stack; give it an illegal * instruction to halt it in its tracks. @@ -1493,11 +1455,6 @@ psignal(p, SIGILL); return; } -#ifdef DEBUG - if (sigdebug & SDB_FOLLOW) - printf("sendsig(%d): sig %d sfp %p code %lx\n", p->p_pid, sig, - sfp, code); -#endif /* * Set up the registers to return to sigcode. @@ -1512,8 +1469,6 @@ sf.sf_si.si_signo = sig; sf.sf_si.si_code = code; sf.sf_si.si_addr = (void*)frame->tf_regs[FRAME_TRAPARG_A0]; - sf.sf_si.si_pid = p->p_pid; - sf.sf_si.si_uid = p->p_ucred->cr_uid; } else frame->tf_regs[FRAME_A1] = code; @@ -1522,15 +1477,6 @@ frame->tf_regs[FRAME_T12] = (u_int64_t)catcher; /* t12 is pv */ frame->tf_regs[FRAME_FLAGS] = 0; /* full restore */ alpha_pal_wrusp((unsigned long)sfp); - -#ifdef DEBUG - if (sigdebug & SDB_FOLLOW) - printf("sendsig(%d): pc %lx, catcher %lx\n", p->p_pid, - frame->tf_regs[FRAME_PC], frame->tf_regs[FRAME_A3]); - if ((sigdebug & SDB_KSTACK) && p->p_pid == sigpid) - printf("sendsig(%d): sig %d returns\n", - p->p_pid, sig); -#endif } /* @@ -1701,10 +1647,6 @@ pcb = td->td_pcb; p = td->td_proc; -#ifdef DEBUG - if (sigdebug & SDB_FOLLOW) - printf("sigreturn: pid %d, scp %p\n", p->p_pid, ucp); -#endif /* * Fetch the entire context structure at once for speed. * Note that struct osigcontext is smaller than a ucontext_t, @@ -1756,10 +1698,6 @@ &td->td_pcb->pcb_fp, sizeof(struct fpreg)); td->td_pcb->pcb_fp_control = uc.uc_mcontext.mc_fp_control; -#ifdef DEBUG - if (sigdebug & SDB_FOLLOW) - printf("sigreturn(%d): returns\n", p->p_pid); -#endif return (EJUSTRETURN); } ==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#39 (text+ko) ==== @@ -43,7 +43,7 @@ * from: @(#)pmap.c 7.7 (Berkeley) 5/12/91 * from: i386 Id: pmap.c,v 1.193 1998/04/19 15:22:48 bde Exp * with some ideas from NetBSD's alpha pmap - * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.110 2002/10/20 21:40:17 alc Exp $ + * $FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.112 2002/11/11 05:17:33 alc Exp $ */ /* @@ -170,6 +170,7 @@ #include <vm/vm_pageout.h> #include <vm/vm_pager.h> #include <vm/uma.h> +#include <vm/uma_int.h> #include <sys/user.h> @@ -321,7 +322,6 @@ * Data for the pv entry allocation mechanism */ static uma_zone_t pvzone; -static struct vm_object pvzone_obj; static int pv_entry_count = 0, pv_entry_max = 0, pv_entry_high_water = 0; static int pmap_pagedaemon_waken = 0; @@ -330,7 +330,6 @@ static void alpha_protection_init(void); static void pmap_changebit(vm_page_t m, int bit, boolean_t setem); -static void pmap_remove_all(vm_page_t m); static vm_page_t pmap_enter_quick(pmap_t pmap, vm_offset_t va, vm_page_t m, vm_page_t mpte); static int pmap_remove_pte(pmap_t pmap, pt_entry_t* ptq, vm_offset_t sva); @@ -345,7 +344,6 @@ static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex); static vm_page_t pmap_page_lookup(vm_object_t object, vm_pindex_t pindex); static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t); -static void *pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait); #ifdef SMP static void pmap_invalidate_page_action(void *arg); static void pmap_invalidate_all_action(void *arg); @@ -566,11 +564,45 @@ return 0; } -static void * -pmap_allocf(uma_zone_t zone, int bytes, u_int8_t *flags, int wait) +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; - return (void *)kmem_alloc(kernel_map, bytes); + + 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; + + m = vm_page_alloc(NULL, color++, pflags | VM_ALLOC_NOOBJ); + + if (m) { + va = (void *)ALPHA_PHYS_TO_K0SEG(m->phys_addr); + if ((m->flags & PG_ZERO) == 0) + bzero(va, PAGE_SIZE); + return (va); + } + + return (NULL); +} + +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(); } /* @@ -608,7 +640,6 @@ initial_pvs = MINPV; pvzone = uma_zcreate("PV ENTRY", sizeof (struct pv_entry), NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, UMA_ZONE_VM); - uma_zone_set_allocf(pvzone, pmap_allocf); uma_prealloc(pvzone, initial_pvs); /* * object for kernel page table pages @@ -634,7 +665,6 @@ TUNABLE_INT_FETCH("vm.pmap.shpgperproc", &shpgperproc); pv_entry_max = shpgperproc * maxproc + vm_page_array_size; pv_entry_high_water = 9 * (pv_entry_max / 10); - uma_zone_set_obj(pvzone, &pvzone_obj, pv_entry_max); } @@ -1901,7 +1931,7 @@ * pmap_remove (slow...) */ -static void +void pmap_remove_all(vm_page_t m) { register pv_entry_t pv; ==== //depot/projects/smpng/sys/alpha/alpha/prom.c#9 (text+ko) ==== @@ -24,7 +24,7 @@ * any improvements or extensions that they make and grant Carnegie Mellon * the rights to redistribute these changes. * - * $FreeBSD: src/sys/alpha/alpha/prom.c,v 1.23 2002/03/21 06:14:57 imp Exp $ + * $FreeBSD: src/sys/alpha/alpha/prom.c,v 1.24 2002/11/08 15:24:32 jhb Exp $ */ #include "opt_simos.h" @@ -99,7 +99,9 @@ void init_bootstrap_console() { +#ifndef SIMOS char buf[4]; +#endif init_prom_interface(hwrpb); @@ -200,12 +202,14 @@ /* * SimOS console uses floating point. */ - if (curproc != PCPU_GET(fpcurproc)) { + if (curthread != PCPU_GET(fpcurthread)) { alpha_pal_wrfen(1); - if (PCPU_GET(fpcurproc)) - savefpstate(&PCPU_GET(fpcurproc)->p_addr->u_pcb.pcb_fp); - PCPU_SET(fpcurproc, curproc); - restorefpstate(&PCPU_GET(fpcurproc)->p_addr->u_pcb.pcb_fp); + if (PCPU_GET(fpcurthread)) { + savefpstate(&PCPU_GET(fpcurthread)->td_pcb->pcb_fp); + PCPU_GET(fpcurthread)->td_pcb->pcb_hw.apcb_flags &= ~ALPHA_PCB_FLAGS_FEN; + } + PCPU_SET(fpcurthread, curthread); + restorefpstate(&PCPU_GET(fpcurthread)->td_pcb->pcb_fp); } #endif if (!pmap_uses_prom_console()) ==== //depot/projects/smpng/sys/alpha/conf/GENERIC#25 (text+ko) ==== @@ -18,7 +18,7 @@ # # For hardware specific information check HARDWARE.TXT # -# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.153 2002/10/19 16:53:59 rwatson Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.154 2002/11/07 14:36:56 jhb Exp $ machine alpha cpu EV4 @@ -31,8 +31,6 @@ makeoptions DEBUG=-g #Build kernel with gdb(1) debug symbols -options NO_GEOM - # Platforms supported options API_UP1000 # UP1000, UP1100 (Nautilus) options DEC_AXPPCI_33 # UDB, Multia, AXPpci33, NoName ==== //depot/projects/smpng/sys/alpha/conf/GENERIC.hints#2 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.4 2001/07/15 17:56:53 obrien Exp $ +# $FreeBSD: src/sys/alpha/conf/GENERIC.hints,v 1.5 2002/10/30 01:34:41 gallatin Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -21,6 +21,5 @@ hint.sio.1.at="isa" hint.sio.1.port="0x2F8" hint.sio.1.irq="3" -hint.sio.1.flags="0x50" hint.ppc.0.at="isa" hint.ppc.0.irq="7" ==== //depot/projects/smpng/sys/alpha/include/atomic.h#7 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.16 2002/10/25 20:22:12 jhb Exp $ + * $FreeBSD: src/sys/alpha/include/atomic.h,v 1.17 2002/10/30 01:41:44 gallatin Exp $ */ #ifndef _MACHINE_ATOMIC_H_ ==== //depot/projects/smpng/sys/alpha/include/bus.h#5 (text+ko) ==== @@ -67,7 +67,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.13 2002/10/21 13:48:29 gallatin Exp $ */ +/* $FreeBSD: src/sys/alpha/include/bus.h,v 1.15 2002/11/08 20:49:43 jhb Exp $ */ #ifndef _ALPHA_BUS_H_ #define _ALPHA_BUS_H_ @@ -233,29 +233,29 @@ #define writel(o, v) bus_space_write_4(busspace_isa_mem, o, 0, v) #define insb(o, a, c) bus_space_read_multi_1(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define insw(o, a, c) bus_space_read_multi_2(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define insl(o, a, c) bus_space_read_multi_4(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define outsb(o, a, c) bus_space_write_multi_1(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define outsw(o, a, c) bus_space_write_multi_2(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define outsl(o, a, c) bus_space_write_multi_4(busspace_isa_io, o, 0, \ - (void*)a, c) + (void*)(a), c) #define memcpy_fromio(d, s, c) \ - bus_space_read_region_1(busspace_isa_mem, s, 0, d, c) + bus_space_read_region_1(busspace_isa_mem, (uintptr_t)(s), 0, d, c) #define memcpy_toio(d, s, c) \ - bus_space_write_region_1(busspace_isa_mem, d, 0, s, c) + bus_space_write_region_1(busspace_isa_mem, (uintptr_t)(d), 0, s, c) #define memcpy_io(d, s, c) \ - bus_space_copy_region_1(busspace_isa_mem, s, 0, d, 0, c) + bus_space_copy_region_1(busspace_isa_mem, (uintptr_t)(s), 0, d, 0, c) #define memset_io(d, v, c) \ - bus_space_set_region_1(busspace_isa_mem, d, 0, v, c) + bus_space_set_region_1(busspace_isa_mem, (uintptr_t)(d), 0, v, c) #define memsetw_io(d, v, c) \ - bus_space_set_region_2(busspace_isa_mem, d, 0, v, c) + bus_space_set_region_2(busspace_isa_mem, (uintptr_t)(d), 0, v, c) static __inline void memsetw(void *d, int val, size_t size) ==== //depot/projects/smpng/sys/alpha/include/vmparam.h#3 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.7 2001/09/12 08:36:55 julian Exp $ */ +/* $FreeBSD: src/sys/alpha/include/vmparam.h,v 1.8 2002/11/01 03:34:51 jeff Exp $ */ /* From: NetBSD: vmparam.h,v 1.6 1997/09/23 23:23:23 mjacob Exp */ #ifndef _ALPHA_VMPARAM_H #define _ALPHA_VMPARAM_H @@ -129,6 +129,12 @@ protected against replacement */ /* + * Alpha provides a machine specific single page allocator through the use + * of K0SEG. + */ +#define UMA_MD_SMALL_ALLOC + +/* * Mach derived constants */ ==== //depot/projects/smpng/sys/alpha/tlsb/dwlpx.c#10 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.22 2002/03/01 23:15:45 mjacob Exp $ + * $FreeBSD: src/sys/alpha/tlsb/dwlpx.c,v 1.23 2002/11/08 20:52:21 jhb Exp $ */ /* @@ -123,7 +123,11 @@ static driver_intr_t dwlpx_intr; static u_int32_t imaskcache[DWLPX_NIONODE][DWLPX_NHOSE][NHPC]; +#ifdef SIMOS +extern void simos_intr(int); +#else static void dwlpx_eintr(unsigned long); +#endif /* * Direct-mapped window: 2G at 2G @@ -741,13 +745,19 @@ /* */ +#ifdef SIMOS static void dwlpx_intr(void *arg) { -#ifdef SIMOS - extern void simos_intr(int); + simos_intr(0); -#else +} + +#else /* !SIMOS */ + +static void +dwlpx_intr(void *arg) +{ unsigned long vec = (unsigned long) arg; if ((vec & DWLPX_VEC_EMARK) != 0) { dwlpx_eintr(vec); @@ -758,7 +768,6 @@ /* NOTREACHED */ } alpha_dispatch_intr(NULL, vec); -#endif } static void @@ -833,6 +842,7 @@ REGVAL(PCIA_ERR(i) + sc->sysbase) = hpcs[i].err; } } +#endif /* SIMOS */ static device_method_t dwlpx_methods[] = { /* Device interface */ ==== //depot/projects/smpng/sys/boot/forth/loader.conf#13 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.64 2002/09/02 20:10:18 brooks Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.66 2002/11/02 08:49:51 mini Exp $ ############################################################## ### Basic configuration options ############################ @@ -91,7 +91,7 @@ #kern.ncallout="" # Set the maximum # of timer events #kern.sgrowsiz="" # Set the amount to grow stack #kern.cam.scsi_delay="2000" # Delay (in ms) before probing SCSI -#kern.ipc.maxsockets="" # Set the maximum number of sockets avaliable >>> TRUNCATED FOR MAIL (1000 lines) <<< To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200211112121.gABLL20j095646>