PERFORCE change 59319 for review
John Baldwin
jhb at FreeBSD.org
Tue Aug 10 11:03:53 PDT 2004
http://perforce.freebsd.org/chv.cgi?CH=59319
Change 59319 by jhb at jhb_slimer on 2004/08/10 18:03:16
IFC @59317.
Affected files ...
.. //depot/projects/smpng/sys/alpha/alpha/autoconf.c#13 integrate
.. //depot/projects/smpng/sys/alpha/alpha/mem.c#16 integrate
.. //depot/projects/smpng/sys/alpha/alpha/pmap.c#61 integrate
.. //depot/projects/smpng/sys/alpha/conf/GENERIC#39 integrate
.. //depot/projects/smpng/sys/alpha/include/cpu.h#11 integrate
.. //depot/projects/smpng/sys/alpha/include/memdev.h#1 branch
.. //depot/projects/smpng/sys/alpha/include/param.h#10 integrate
.. //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#6 integrate
.. //depot/projects/smpng/sys/amd64/amd64/autoconf.c#8 integrate
.. //depot/projects/smpng/sys/amd64/amd64/io.c#1 branch
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#26 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mem.c#10 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#10 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#29 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#20 integrate
.. //depot/projects/smpng/sys/amd64/conf/GENERIC#20 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#7 integrate
.. //depot/projects/smpng/sys/amd64/include/cpu.h#6 integrate
.. //depot/projects/smpng/sys/amd64/include/cpufunc.h#10 integrate
.. //depot/projects/smpng/sys/amd64/include/elf.h#4 integrate
.. //depot/projects/smpng/sys/amd64/include/iodev.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/memdev.h#1 branch
.. //depot/projects/smpng/sys/amd64/include/param.h#10 integrate
.. //depot/projects/smpng/sys/amd64/include/profile.h#6 integrate
.. //depot/projects/smpng/sys/arm/arm/machdep.c#4 integrate
.. //depot/projects/smpng/sys/arm/arm/pmap.c#6 integrate
.. //depot/projects/smpng/sys/arm/include/cpu.h#2 integrate
.. //depot/projects/smpng/sys/arm/include/endian.h#4 integrate
.. //depot/projects/smpng/sys/arm/include/vmparam.h#2 integrate
.. //depot/projects/smpng/sys/boot/common/help.common#12 integrate
.. //depot/projects/smpng/sys/boot/efi/loader/main.c#12 integrate
.. //depot/projects/smpng/sys/boot/forth/loader.conf#28 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#15 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#4 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/boot2.c#23 integrate
.. //depot/projects/smpng/sys/boot/i386/btx/lib/btxcsu.s#2 integrate
.. //depot/projects/smpng/sys/boot/ofw/common/main.c#6 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/libofw.h#7 integrate
.. //depot/projects/smpng/sys/boot/ofw/libofw/ofw_memory.c#5 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/boot.h#5 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/disk.c#7 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/io.c#5 integrate
.. //depot/projects/smpng/sys/boot/pc98/boot2/sys.c#5 integrate
.. //depot/projects/smpng/sys/boot/powerpc/loader/Makefile#11 integrate
.. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#53 integrate
.. //depot/projects/smpng/sys/coda/coda_vfsops.c#16 integrate
.. //depot/projects/smpng/sys/compat/ndis/hal_var.h#4 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#17 integrate
.. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#13 integrate
.. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#10 integrate
.. //depot/projects/smpng/sys/compat/ndis/pe_var.h#5 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#8 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#18 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#18 integrate
.. //depot/projects/smpng/sys/conf/NOTES#76 integrate
.. //depot/projects/smpng/sys/conf/files#116 integrate
.. //depot/projects/smpng/sys/conf/files.alpha#31 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#20 integrate
.. //depot/projects/smpng/sys/conf/files.i386#66 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#43 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#62 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#41 integrate
.. //depot/projects/smpng/sys/conf/options#83 integrate
.. //depot/projects/smpng/sys/contrib/pf/netinet/in4_cksum.c#3 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi.c#70 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpi_pci_link.c#16 integrate
.. //depot/projects/smpng/sys/dev/acpica/acpivar.h#45 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.c#20 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.h#17 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.reg#15 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx.seq#14 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_inline.h#14 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#15 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_pci.c#18 integrate
.. //depot/projects/smpng/sys/dev/an/if_an.c#40 integrate
.. //depot/projects/smpng/sys/dev/arl/if_arl.c#6 integrate
.. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#4 integrate
.. //depot/projects/smpng/sys/dev/arl/if_arlreg.h#5 integrate
.. //depot/projects/smpng/sys/dev/asr/asr.c#26 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#55 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#28 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#39 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.c#42 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-dma.c#37 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#17 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#47 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#15 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-raid.c#31 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#50 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#25 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#28 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#18 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#9 integrate
.. //depot/projects/smpng/sys/dev/bfe/if_bfereg.h#3 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_card.c#6 integrate
.. //depot/projects/smpng/sys/dev/bktr/bktr_card.h#4 integrate
.. //depot/projects/smpng/sys/dev/ciss/cissio.h#4 integrate
.. //depot/projects/smpng/sys/dev/ciss/cissreg.h#9 integrate
.. //depot/projects/smpng/sys/dev/digi/digi.c#25 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_drv.h#19 integrate
.. //depot/projects/smpng/sys/dev/eisa/eisaconf.c#8 integrate
.. //depot/projects/smpng/sys/dev/en/midway.c#24 integrate
.. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#2 integrate
.. //depot/projects/smpng/sys/dev/esp/lsi64854.c#2 integrate
.. //depot/projects/smpng/sys/dev/esp/lsi64854var.h#2 integrate
.. //depot/projects/smpng/sys/dev/esp/ncr53c9x.c#2 integrate
.. //depot/projects/smpng/sys/dev/esp/ncr53c9xreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/esp/ncr53c9xvar.h#2 integrate
.. //depot/projects/smpng/sys/dev/fb/splash_bmp.c#1 branch
.. //depot/projects/smpng/sys/dev/fb/splash_pcx.c#1 branch
.. //depot/projects/smpng/sys/dev/fdc/fdc_acpi.c#2 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#31 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohcireg.h#16 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme.c#17 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#9 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hmereg.h#6 integrate
.. //depot/projects/smpng/sys/dev/hme/if_hmevar.h#5 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#18 integrate
.. //depot/projects/smpng/sys/dev/io/iodev.c#1 branch
.. //depot/projects/smpng/sys/dev/md/md.c#52 integrate
.. //depot/projects/smpng/sys/dev/mem/memdev.c#1 branch
.. //depot/projects/smpng/sys/dev/mem/memutil.c#1 branch
.. //depot/projects/smpng/sys/dev/null/null.c#18 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_console.c#19 integrate
.. //depot/projects/smpng/sys/dev/random/randomdev.c#27 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.c#42 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_dev_ns8250.c#6 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/ehcireg.h#5 integrate
.. //depot/projects/smpng/sys/dev/usb/ehcivar.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci.c#31 integrate
.. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/ohcivar.h#10 integrate
.. //depot/projects/smpng/sys/dev/usb/uhci.c#32 integrate
.. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#10 integrate
.. //depot/projects/smpng/sys/dev/usb/uhcivar.h#10 integrate
.. //depot/projects/smpng/sys/dev/usb/uhub.c#17 integrate
.. //depot/projects/smpng/sys/dev/usb/umass.c#39 integrate
.. //depot/projects/smpng/sys/dev/usb/umct.c#7 integrate
.. //depot/projects/smpng/sys/dev/usb/uplcom.c#12 integrate
.. //depot/projects/smpng/sys/dev/usb/usb.c#26 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_mem.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#58 integrate
.. //depot/projects/smpng/sys/dev/wi/if_wi.c#64 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vfsops.c#14 integrate
.. //depot/projects/smpng/sys/fs/fdescfs/fdesc_vfsops.c#14 integrate
.. //depot/projects/smpng/sys/fs/hpfs/hpfs_vfsops.c#22 integrate
.. //depot/projects/smpng/sys/fs/hpfs/hpfs_vnops.c#21 integrate
.. //depot/projects/smpng/sys/fs/msdosfs/msdosfs_vfsops.c#32 integrate
.. //depot/projects/smpng/sys/fs/ntfs/ntfs_vfsops.c#22 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_vfsops.c#13 integrate
.. //depot/projects/smpng/sys/fs/nwfs/nwfs_vfsops.c#16 integrate
.. //depot/projects/smpng/sys/fs/portalfs/portal_vfsops.c#14 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.c#19 integrate
.. //depot/projects/smpng/sys/fs/pseudofs/pseudofs.h#21 integrate
.. //depot/projects/smpng/sys/fs/smbfs/smbfs_vfsops.c#24 integrate
.. //depot/projects/smpng/sys/fs/specfs/spec_vnops.c#35 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vfsops.c#16 integrate
.. //depot/projects/smpng/sys/fs/umapfs/umap_vfsops.c#18 integrate
.. //depot/projects/smpng/sys/fs/unionfs/union_vfsops.c#20 integrate
.. //depot/projects/smpng/sys/geom/bde/g_bde.c#14 integrate
.. //depot/projects/smpng/sys/geom/concat/g_concat.c#8 integrate
.. //depot/projects/smpng/sys/geom/concat/g_concat.h#7 integrate
.. //depot/projects/smpng/sys/geom/gate/g_gate.c#6 integrate
.. //depot/projects/smpng/sys/geom/geom.h#38 integrate
.. //depot/projects/smpng/sys/geom/geom_aes.c#14 integrate
.. //depot/projects/smpng/sys/geom/geom_apple.c#10 integrate
.. //depot/projects/smpng/sys/geom/geom_bsd.c#35 integrate
.. //depot/projects/smpng/sys/geom/geom_ccd.c#11 integrate
.. //depot/projects/smpng/sys/geom/geom_dev.c#36 integrate
.. //depot/projects/smpng/sys/geom/geom_disk.c#39 integrate
.. //depot/projects/smpng/sys/geom/geom_fox.c#6 integrate
.. //depot/projects/smpng/sys/geom/geom_gpt.c#16 integrate
.. //depot/projects/smpng/sys/geom/geom_mbr.c#26 integrate
.. //depot/projects/smpng/sys/geom/geom_mirror.c#9 delete
.. //depot/projects/smpng/sys/geom/geom_pc98.c#24 integrate
.. //depot/projects/smpng/sys/geom/geom_subr.c#42 integrate
.. //depot/projects/smpng/sys/geom/geom_sunlabel.c#25 integrate
.. //depot/projects/smpng/sys/geom/geom_vol_ffs.c#8 integrate
.. //depot/projects/smpng/sys/geom/label/g_label.c#4 integrate
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.c#1 branch
.. //depot/projects/smpng/sys/geom/mirror/g_mirror.h#1 branch
.. //depot/projects/smpng/sys/geom/mirror/g_mirror_ctl.c#1 branch
.. //depot/projects/smpng/sys/geom/nop/g_nop.c#3 integrate
.. //depot/projects/smpng/sys/geom/nop/g_nop.h#3 integrate
.. //depot/projects/smpng/sys/geom/stripe/g_stripe.c#5 integrate
.. //depot/projects/smpng/sys/geom/stripe/g_stripe.h#4 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.c#5 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum.h#2 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_drive.c#3 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_plex.c#3 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_subr.c#3 integrate
.. //depot/projects/smpng/sys/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/smpng/sys/gnu/ext2fs/ext2_vfsops.c#35 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_asus.c#5 integrate
.. //depot/projects/smpng/sys/i386/acpica/acpi_wakeup.c#28 integrate
.. //depot/projects/smpng/sys/i386/conf/GENERIC#53 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#86 integrate
.. //depot/projects/smpng/sys/i386/i386/autoconf.c#19 integrate
.. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#8 integrate
.. //depot/projects/smpng/sys/i386/i386/io.c#1 branch
.. //depot/projects/smpng/sys/i386/i386/io_apic.c#8 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#78 integrate
.. //depot/projects/smpng/sys/i386/i386/mem.c#22 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#65 integrate
.. //depot/projects/smpng/sys/i386/i386/pmap.c#67 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#71 integrate
.. //depot/projects/smpng/sys/i386/include/cpu.h#12 integrate
.. //depot/projects/smpng/sys/i386/include/elf.h#7 integrate
.. //depot/projects/smpng/sys/i386/include/intr_machdep.h#4 integrate
.. //depot/projects/smpng/sys/i386/include/iodev.h#1 branch
.. //depot/projects/smpng/sys/i386/include/memdev.h#1 branch
.. //depot/projects/smpng/sys/i386/include/param.h#13 integrate
.. //depot/projects/smpng/sys/i386/isa/atpic.c#10 integrate
.. //depot/projects/smpng/sys/ia64/conf/GENERIC#39 integrate
.. //depot/projects/smpng/sys/ia64/conf/SKI#17 integrate
.. //depot/projects/smpng/sys/ia64/ia64/autoconf.c#13 integrate
.. //depot/projects/smpng/sys/ia64/ia64/gdb_machdep.c#2 integrate
.. //depot/projects/smpng/sys/ia64/ia64/locore.S#3 integrate
.. //depot/projects/smpng/sys/ia64/ia64/machdep.c#82 integrate
.. //depot/projects/smpng/sys/ia64/ia64/mem.c#17 integrate
.. //depot/projects/smpng/sys/ia64/ia64/pmap.c#60 integrate
.. //depot/projects/smpng/sys/ia64/ia64/syscall.S#8 integrate
.. //depot/projects/smpng/sys/ia64/ia64/trap.c#66 integrate
.. //depot/projects/smpng/sys/ia64/include/cpu.h#22 integrate
.. //depot/projects/smpng/sys/ia64/include/cpufunc.h#21 integrate
.. //depot/projects/smpng/sys/ia64/include/gdb_machdep.h#2 integrate
.. //depot/projects/smpng/sys/ia64/include/memdev.h#1 branch
.. //depot/projects/smpng/sys/ia64/include/pte.h#3 integrate
.. //depot/projects/smpng/sys/isa/psm.c#27 integrate
.. //depot/projects/smpng/sys/isofs/cd9660/cd9660_vfsops.c#29 integrate
.. //depot/projects/smpng/sys/kern/imgact_elf.c#38 integrate
.. //depot/projects/smpng/sys/kern/init_main.c#45 integrate
.. //depot/projects/smpng/sys/kern/kern_condvar.c#37 integrate
.. //depot/projects/smpng/sys/kern/kern_descrip.c#64 integrate
.. //depot/projects/smpng/sys/kern/kern_exit.c#81 integrate
.. //depot/projects/smpng/sys/kern/kern_fork.c#80 integrate
.. //depot/projects/smpng/sys/kern/kern_intr.c#49 integrate
.. //depot/projects/smpng/sys/kern/kern_kse.c#6 integrate
.. //depot/projects/smpng/sys/kern/kern_mbuf.c#2 integrate
.. //depot/projects/smpng/sys/kern/kern_mutex.c#83 integrate
.. //depot/projects/smpng/sys/kern/kern_proc.c#63 integrate
.. //depot/projects/smpng/sys/kern/kern_resource.c#49 integrate
.. //depot/projects/smpng/sys/kern/kern_shutdown.c#45 integrate
.. //depot/projects/smpng/sys/kern/kern_sig.c#94 integrate
.. //depot/projects/smpng/sys/kern/kern_switch.c#41 integrate
.. //depot/projects/smpng/sys/kern/kern_synch.c#77 integrate
.. //depot/projects/smpng/sys/kern/kern_thread.c#63 integrate
.. //depot/projects/smpng/sys/kern/kern_timeout.c#20 integrate
.. //depot/projects/smpng/sys/kern/link_elf.c#26 integrate
.. //depot/projects/smpng/sys/kern/sched_4bsd.c#32 integrate
.. //depot/projects/smpng/sys/kern/sched_ule.c#37 integrate
.. //depot/projects/smpng/sys/kern/subr_rman.c#16 integrate
.. //depot/projects/smpng/sys/kern/subr_taskqueue.c#20 integrate
.. //depot/projects/smpng/sys/kern/subr_trap.c#68 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#119 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#46 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#40 integrate
.. //depot/projects/smpng/sys/kern/vfs_init.c#16 integrate
.. //depot/projects/smpng/sys/kern/vfs_lookup.c#19 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#31 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#78 integrate
.. //depot/projects/smpng/sys/kern/vfs_vnops.c#48 integrate
.. //depot/projects/smpng/sys/modules/Makefile#79 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_asus/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_panasonic/Makefile#2 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_toshiba/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/acpi/acpi_video/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/geom/Makefile#9 integrate
.. //depot/projects/smpng/sys/modules/geom/geom_mirror/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/io/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/md/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/mem/Makefile#1 branch
.. //depot/projects/smpng/sys/modules/null/Makefile#3 delete
.. //depot/projects/smpng/sys/modules/splash/bmp/Makefile#4 integrate
.. //depot/projects/smpng/sys/modules/splash/bmp/splash_bmp.c#5 delete
.. //depot/projects/smpng/sys/modules/splash/pcx/Makefile#3 integrate
.. //depot/projects/smpng/sys/modules/splash/pcx/splash_pcx.c#4 delete
.. //depot/projects/smpng/sys/net/bpf.c#38 integrate
.. //depot/projects/smpng/sys/net/if.c#51 integrate
.. //depot/projects/smpng/sys/net/if_gre.c#20 integrate
.. //depot/projects/smpng/sys/net/if_sl.c#23 integrate
.. //depot/projects/smpng/sys/net/if_var.h#29 integrate
.. //depot/projects/smpng/sys/netatalk/aarp.c#15 integrate
.. //depot/projects/smpng/sys/netatalk/ddp_input.c#12 integrate
.. //depot/projects/smpng/sys/netgraph/bluetooth/include/ng_hci.h#4 integrate
.. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#8 integrate
.. //depot/projects/smpng/sys/netgraph/ng_l2tp.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/ng_ppp.c#15 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#21 integrate
.. //depot/projects/smpng/sys/netgraph/ng_sample.c#6 integrate
.. //depot/projects/smpng/sys/netgraph/ng_socket.c#23 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#31 integrate
.. //depot/projects/smpng/sys/netinet/ip_divert.c#35 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#21 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#36 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#55 integrate
.. //depot/projects/smpng/sys/netinet/ip_mroute.c#34 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#60 integrate
.. //depot/projects/smpng/sys/netinet/tcp_subr.c#52 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#46 integrate
.. //depot/projects/smpng/sys/netinet6/in6_pcb.c#32 integrate
.. //depot/projects/smpng/sys/netinet6/in6_pcb.h#10 integrate
.. //depot/projects/smpng/sys/netinet6/raw_ip6.c#27 integrate
.. //depot/projects/smpng/sys/netinet6/udp6_usrreq.c#30 integrate
.. //depot/projects/smpng/sys/nfs4client/nfs4_vfsops.c#7 integrate
.. //depot/projects/smpng/sys/nfsclient/bootp_subr.c#27 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_diskless.c#8 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vfsops.c#39 integrate
.. //depot/projects/smpng/sys/opencrypto/cryptodev.c#14 integrate
.. //depot/projects/smpng/sys/pc98/conf/GENERIC#46 integrate
.. //depot/projects/smpng/sys/pc98/conf/NOTES#30 integrate
.. //depot/projects/smpng/sys/pc98/i386/machdep.c#69 integrate
.. //depot/projects/smpng/sys/pci/agp_via.c#12 integrate
.. //depot/projects/smpng/sys/pci/agpreg.h#10 integrate
.. //depot/projects/smpng/sys/pci/if_rl.c#52 integrate
.. //depot/projects/smpng/sys/pci/if_vr.c#29 integrate
.. //depot/projects/smpng/sys/pci/if_xl.c#48 integrate
.. //depot/projects/smpng/sys/powerpc/conf/GENERIC#22 integrate
.. //depot/projects/smpng/sys/powerpc/include/cpu.h#16 integrate
.. //depot/projects/smpng/sys/powerpc/include/cpufunc.h#18 integrate
.. //depot/projects/smpng/sys/powerpc/include/critical.h#7 integrate
.. //depot/projects/smpng/sys/powerpc/include/reg.h#6 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/machdep.c#53 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/pmap.c#44 integrate
.. //depot/projects/smpng/sys/powerpc/powerpc/trap.c#38 integrate
.. //depot/projects/smpng/sys/security/mac/mac_label.c#2 integrate
.. //depot/projects/smpng/sys/sparc64/conf/GENERIC#43 integrate
.. //depot/projects/smpng/sys/sparc64/include/cpu.h#14 integrate
.. //depot/projects/smpng/sys/sparc64/include/memdev.h#1 branch
.. //depot/projects/smpng/sys/sparc64/sparc64/mem.c#12 integrate
.. //depot/projects/smpng/sys/sparc64/sparc64/pmap.c#51 integrate
.. //depot/projects/smpng/sys/sys/bio.h#20 integrate
.. //depot/projects/smpng/sys/sys/gpt.h#4 integrate
.. //depot/projects/smpng/sys/sys/kse.h#17 integrate
.. //depot/projects/smpng/sys/sys/ktr.h#15 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#41 integrate
.. //depot/projects/smpng/sys/sys/mdioctl.h#9 integrate
.. //depot/projects/smpng/sys/sys/memrange.h#4 integrate
.. //depot/projects/smpng/sys/sys/mount.h#32 integrate
.. //depot/projects/smpng/sys/sys/mouse.h#3 integrate
.. //depot/projects/smpng/sys/sys/mutex.h#44 integrate
.. //depot/projects/smpng/sys/sys/param.h#67 integrate
.. //depot/projects/smpng/sys/sys/proc.h#122 integrate
.. //depot/projects/smpng/sys/sys/ptrace.h#13 integrate
.. //depot/projects/smpng/sys/sys/resourcevar.h#22 integrate
.. //depot/projects/smpng/sys/sys/systm.h#54 integrate
.. //depot/projects/smpng/sys/sys/taskqueue.h#8 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_extern.h#13 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_softdep.c#35 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#57 integrate
.. //depot/projects/smpng/sys/vm/device_pager.c#17 integrate
.. //depot/projects/smpng/sys/vm/swap_pager.c#48 integrate
.. //depot/projects/smpng/sys/vm/uma.h#12 integrate
.. //depot/projects/smpng/sys/vm/uma_core.c#47 integrate
.. //depot/projects/smpng/sys/vm/uma_dbg.c#9 integrate
.. //depot/projects/smpng/sys/vm/uma_dbg.h#3 integrate
.. //depot/projects/smpng/sys/vm/uma_int.h#21 integrate
.. //depot/projects/smpng/sys/vm/vm_contig.c#27 integrate
.. //depot/projects/smpng/sys/vm/vm_fault.c#37 integrate
.. //depot/projects/smpng/sys/vm/vm_glue.c#47 integrate
.. //depot/projects/smpng/sys/vm/vm_init.c#12 integrate
.. //depot/projects/smpng/sys/vm/vm_kern.c#30 integrate
.. //depot/projects/smpng/sys/vm/vm_map.c#65 integrate
.. //depot/projects/smpng/sys/vm/vm_map.h#31 integrate
.. //depot/projects/smpng/sys/vm/vm_mmap.c#47 integrate
.. //depot/projects/smpng/sys/vm/vm_object.c#57 integrate
.. //depot/projects/smpng/sys/vm/vm_page.c#55 integrate
Differences ...
==== //depot/projects/smpng/sys/alpha/alpha/autoconf.c#13 (text+ko) ====
@@ -25,12 +25,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.59 2004/07/08 22:35:33 brian Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/autoconf.c,v 1.60 2004/07/28 21:54:56 phk Exp $");
#include "opt_bootp.h"
#include "opt_isa.h"
-#include "opt_nfs.h"
-#include "opt_nfsroot.h"
#include <sys/param.h>
#include <sys/systm.h>
@@ -67,8 +65,6 @@
device_t isa_bus_device = 0;
#endif
-extern int nfs_diskless_valid; /* XXX use include file */
-
static void
configure_start()
{
@@ -194,20 +190,3 @@
cold = 0;
}
-
-/*
- * Do legacy root filesystem discovery. This isn't really
- * needed on the Alpha, which has always used the loader.
- */
-void
-cpu_rootconf()
-{
-#if defined(NFSCLIENT) && defined(NFS_ROOT)
- int order = 0;
-#if !defined(BOOTP_NFSROOT)
- if (nfs_diskless_valid)
-#endif
- rootdevnames[order++] = "nfs:";
-#endif
-}
-SYSINIT(cpu_rootconf, SI_SUB_ROOT_CONF, SI_ORDER_FIRST, cpu_rootconf, NULL)
==== //depot/projects/smpng/sys/alpha/alpha/mem.c#16 (text+ko) ====
@@ -37,7 +37,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.50 2004/06/16 09:46:26 phk Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/mem.c,v 1.51 2004/08/01 11:40:50 markm Exp $");
/*
* Memory special file
@@ -59,85 +59,19 @@
#include <sys/uio.h>
#include <machine/md_var.h>
-#ifdef PERFMON
-#include <machine/perfmon.h>
-#endif
#include <vm/vm.h>
#include <vm/pmap.h>
#include <vm/vm_extern.h>
-static struct cdev *memdev, *kmemdev;
-#ifdef PERFMON
-static struct cdev *perfdev;
-#endif /* PERFMON */
-
-static d_open_t mmopen;
-static d_close_t mmclose;
-static d_read_t mmrw;
-static d_ioctl_t mmioctl;
-static d_mmap_t memmmap;
+#include <machine/memdev.h>
-#define CDEV_MAJOR 2
-static struct cdevsw mem_cdevsw = {
- .d_version = D_VERSION,
- .d_open = mmopen,
- .d_close = mmclose,
- .d_read = mmrw,
- .d_write = mmrw,
- .d_ioctl = mmioctl,
- .d_mmap = memmmap,
- .d_name = "mem",
- .d_maj = CDEV_MAJOR,
- .d_flags = D_MEM | D_NEEDGIANT,
-};
-
struct mem_range_softc mem_range_softc;
-static int
-mmclose(struct cdev *dev, int flags, int fmt, struct thread *td)
+/* ARGSUSED */
+int
+memrw(struct cdev *dev, struct uio *uio, int flags)
{
- switch (minor(dev)) {
-#ifdef PERFMON
- case 32:
- return perfmon_close(dev, flags, fmt, td);
-#endif
- default:
- break;
- }
- return (0);
-}
-
-static int
-mmopen(struct cdev *dev, int flags, int fmt, struct thread *td)
-{
- int error;
-
- switch (minor(dev)) {
- case 0:
- case 1:
- if (flags & FWRITE) {
- error = securelevel_gt(td->td_ucred, 0);
- if (error)
- return (error);
- }
- break;
- case 32:
-#ifdef PERFMON
- return perfmon_open(dev, flags, fmt, td);
-#else
- return ENODEV;
-#endif
- default:
- break;
- }
- return (0);
-}
-
-/*ARGSUSED*/
-static int
-mmrw(struct cdev *dev, struct uio *uio, int flags)
-{
vm_offset_t o, v;
int c = 0;
struct iovec *iov;
@@ -152,13 +86,10 @@
uio->uio_iov++;
uio->uio_iovcnt--;
if (uio->uio_iovcnt < 0)
- panic("mmrw");
+ panic("memrw");
continue;
}
- switch (minor(dev)) {
-
-/* minor device 0 is physical memory */
- case 0:
+ if (minor(dev) == CDEV_MINOR_MEM) {
v = uio->uio_offset;
kmemphys:
/* Allow reads only in RAM. */
@@ -174,9 +105,8 @@
error =
uiomove((caddr_t)ALPHA_PHYS_TO_K0SEG(v), c, uio);
continue;
-
-/* minor device 1 is kernel memory */
- case 1:
+ }
+ else if (minor(dev) == CDEV_MINOR_KMEM) {
v = uio->uio_offset;
if (v >= ALPHA_K0SEG_BASE && v <= ALPHA_K0SEG_END) {
@@ -186,8 +116,9 @@
c = min(iov->iov_len, MAXPHYS);
/*
- * Make sure that all of the pages are currently resident so
- * that we don't create any zero-fill pages.
+ * Make sure that all of the pages are currently
+ * resident so that we don't create any zero-fill
+ * pages.
*/
addr = trunc_page(v);
eaddr = round_page(v + c);
@@ -203,22 +134,16 @@
error = uiomove((caddr_t)v, c, uio);
continue;
}
-
- if (error)
- break;
- iov->iov_base = (char *)iov->iov_base + c;
- iov->iov_len -= c;
- uio->uio_offset += c;
- uio->uio_resid -= c;
+ /* else panic! */
}
return (error);
}
-/*******************************************************\
-* allow user processes to MMAP some memory sections *
-* instead of going through read/write *
-\*******************************************************/
-static int
+/*
+ * allow user processes to MMAP some memory sections
+ * instead of going through read/write
+ */
+int
memmmap(struct cdev *dev, vm_offset_t offset, vm_paddr_t *paddr, int prot)
{
/*
@@ -227,7 +152,7 @@
* could be transient and hence incorrect or invalid at
* a later time.
*/
- if (minor(dev) != 0)
+ if (minor(dev) != CDEV_MINOR_MEM)
return (-1);
/*
@@ -239,59 +164,7 @@
return (0);
}
-static int
-mmioctl(struct cdev *dev, u_long cmd, caddr_t cmdarg, int flags, struct thread *td)
-{
- switch(minor(dev)) {
-#ifdef PERFMON
- case 32:
- return perfmon_ioctl(dev, cmd, cmdarg, flags, td);
-#endif
- default:
- return ENODEV;
- }
-
- return (0);
-}
-
-static int
-mem_modevent(module_t mod, int type, void *data)
+void
+dev_mem_md_init(void)
{
- switch(type) {
- case MOD_LOAD:
- if (bootverbose)
- printf("mem: <memory & I/O>\n");
-/* XXX - ??? */
-#if 0
- /* Initialise memory range handling */
- if (mem_range_softc.mr_op != NULL)
- mem_range_softc.mr_op->init(&mem_range_softc);
-#endif
-
- memdev = make_dev(&mem_cdevsw, 0, UID_ROOT, GID_KMEM,
- 0640, "mem");
- kmemdev = make_dev(&mem_cdevsw, 1, UID_ROOT, GID_KMEM,
- 0640, "kmem");
-#ifdef PERFMON
- perfdev = make_dev(&mem_cdevsw, 32, UID_ROOT, GID_KMEM,
- 0640, "perfmon");
-#endif /* PERFMON */
- return 0;
-
- case MOD_UNLOAD:
- destroy_dev(memdev);
- destroy_dev(kmemdev);
-#ifdef PERFMON
- destroy_dev(perfdev);
-#endif /* PERFMON */
- return 0;
-
- case MOD_SHUTDOWN:
- return 0;
-
- default:
- return EOPNOTSUPP;
- }
}
-
-DEV_MODULE(mem, mem_modevent, NULL);
==== //depot/projects/smpng/sys/alpha/alpha/pmap.c#61 (text+ko) ====
@@ -148,7 +148,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.163 2004/07/21 03:38:46 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/alpha/alpha/pmap.c,v 1.165 2004/08/04 18:04:43 alc Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -336,6 +336,7 @@
static vm_page_t pmap_allocpte(pmap_t pmap, vm_offset_t va);
static vm_page_t _pmap_allocpte(pmap_t pmap, unsigned ptepindex);
+static int _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m);
static int pmap_unuse_pt(pmap_t, vm_offset_t, vm_page_t);
#ifdef SMP
static void pmap_invalidate_page_action(void *arg);
@@ -894,74 +895,65 @@
* This routine unholds page table pages, and if the hold count
* drops to zero, then it decrements the wire count.
*/
+static PMAP_INLINE int
+pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m)
+{
+
+ vm_page_unhold(m);
+ if (m->hold_count == 0)
+ return _pmap_unwire_pte_hold(pmap, va, m);
+ else
+ return 0;
+}
+
static int
_pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m)
{
+ vm_offset_t pteva;
+ pt_entry_t* pte;
- while (vm_page_sleep_if_busy(m, FALSE, "pmuwpt"))
- vm_page_lock_queues();
+ /*
+ * unmap the page table page
+ */
+ if (m->pindex >= NUSERLEV3MAPS) {
+ /* Level 2 page table */
+ pte = pmap_lev1pte(pmap, va);
+ pteva = (vm_offset_t) PTlev2 + alpha_ptob(m->pindex - NUSERLEV3MAPS);
+ } else {
+ /* Level 3 page table */
+ pte = pmap_lev2pte(pmap, va);
+ pteva = (vm_offset_t) PTmap + alpha_ptob(m->pindex);
+ }
- if (m->hold_count == 0) {
- vm_offset_t pteva;
- pt_entry_t* pte;
+ *pte = 0;
- /*
- * unmap the page table page
- */
- if (m->pindex >= NUSERLEV3MAPS) {
- /* Level 2 page table */
- pte = pmap_lev1pte(pmap, va);
- pteva = (vm_offset_t) PTlev2 + alpha_ptob(m->pindex - NUSERLEV3MAPS);
- } else {
- /* Level 3 page table */
- pte = pmap_lev2pte(pmap, va);
- pteva = (vm_offset_t) PTmap + alpha_ptob(m->pindex);
- }
+ if (m->pindex < NUSERLEV3MAPS) {
+ /* unhold the level 2 page table */
+ vm_page_t lev2pg;
- *pte = 0;
+ lev2pg = PHYS_TO_VM_PAGE(pmap_pte_pa(pmap_lev1pte(pmap, va)));
+ pmap_unwire_pte_hold(pmap, va, lev2pg);
+ }
- if (m->pindex < NUSERLEV3MAPS) {
- /* unhold the level 2 page table */
- vm_page_t lev2pg;
+ --pmap->pm_stats.resident_count;
+ /*
+ * Do a invltlb to make the invalidated mapping
+ * take effect immediately.
+ */
+ pmap_invalidate_page(pmap, pteva);
- lev2pg = PHYS_TO_VM_PAGE(pmap_pte_pa(pmap_lev1pte(pmap, va)));
- vm_page_unhold(lev2pg);
- if (lev2pg->hold_count == 0)
- _pmap_unwire_pte_hold(pmap, va, lev2pg);
- }
+ if (pmap->pm_ptphint == m)
+ pmap->pm_ptphint = NULL;
- --pmap->pm_stats.resident_count;
- /*
- * Do a invltlb to make the invalidated mapping
- * take effect immediately.
- */
- pmap_invalidate_page(pmap, pteva);
-
- if (pmap->pm_ptphint == m)
- pmap->pm_ptphint = NULL;
-
- /*
- * If the page is finally unwired, simply free it.
- */
- --m->wire_count;
- if (m->wire_count == 0) {
- vm_page_busy(m);
- vm_page_free_zero(m);
- atomic_subtract_int(&cnt.v_wire_count, 1);
- }
- return 1;
+ /*
+ * If the page is finally unwired, simply free it.
+ */
+ --m->wire_count;
+ if (m->wire_count == 0) {
+ vm_page_free_zero(m);
+ atomic_subtract_int(&cnt.v_wire_count, 1);
}
- return 0;
-}
-
-static PMAP_INLINE int
-pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m)
-{
- vm_page_unhold(m);
- if (m->hold_count == 0)
- return _pmap_unwire_pte_hold(pmap, va, m);
- else
- return 0;
+ return 1;
}
/*
@@ -1070,7 +1062,11 @@
*/
if ((m = vm_page_alloc(NULL, ptepindex, VM_ALLOC_NOOBJ |
VM_ALLOC_WIRED | VM_ALLOC_ZERO)) == NULL) {
+ PMAP_UNLOCK(pmap);
+ vm_page_unlock_queues();
VM_WAIT;
+ vm_page_lock_queues();
+ PMAP_LOCK(pmap);
/*
* Indicate the need to retry. While waiting, the page table
@@ -1107,10 +1103,8 @@
pt_entry_t* l2map;
if (!pmap_pte_v(l1pte)) {
if (_pmap_allocpte(pmap, NUSERLEV3MAPS + l1index) == NULL) {
- vm_page_lock_queues();
vm_page_unhold(m);
vm_page_free(m);
- vm_page_unlock_queues();
return (NULL);
}
} else {
@@ -1402,11 +1396,11 @@
pv->pv_pmap = pmap;
pv->pv_ptem = mpte;
- vm_page_lock_queues();
+ PMAP_LOCK_ASSERT(pmap, MA_OWNED);
+ mtx_assert(&vm_page_queue_mtx, MA_OWNED);
TAILQ_INSERT_TAIL(&pmap->pm_pvlist, pv, pv_plist);
TAILQ_INSERT_TAIL(&m->md.pv_list, pv, pv_list);
m->md.pv_list_count++;
- vm_page_unlock_queues();
}
/*
@@ -1697,6 +1691,10 @@
#endif
mpte = NULL;
+
+ vm_page_lock_queues();
+ PMAP_LOCK(pmap);
+
/*
* In the case that a page table page is not
* resident, we are creating it here.
@@ -1762,11 +1760,7 @@
*/
if (opa) {
int err;
- vm_page_lock_queues();
- PMAP_LOCK(pmap);
err = pmap_remove_pte(pmap, pte, va);
- PMAP_UNLOCK(pmap);
- vm_page_unlock_queues();
if (err)
panic("pmap_enter: pte vanished, va: 0x%lx", va);
}
@@ -1820,6 +1814,8 @@
if (prot & VM_PROT_EXECUTE)
alpha_pal_imb();
}
+ vm_page_unlock_queues();
+ PMAP_UNLOCK(pmap);
}
/*
@@ -1839,6 +1835,9 @@
register pt_entry_t *pte;
int managed;
+ vm_page_lock_queues();
+ PMAP_LOCK(pmap);
+
/*
* In the case that a page table page is not
* resident, we are creating it here.
@@ -1892,12 +1891,10 @@
pte = vtopte(va);
if (*pte) {
if (mpte != NULL) {
- vm_page_lock_queues();
pmap_unwire_pte_hold(pmap, va, mpte);
- vm_page_unlock_queues();
+ mpte = NULL;
}
- alpha_pal_imb(); /* XXX overkill? */
- return 0;
+ goto out;
}
/*
@@ -1920,8 +1917,10 @@
* Now validate mapping with RO protection
*/
*pte = pmap_phys_to_pte(VM_PAGE_TO_PHYS(m)) | PG_V | PG_KRE | PG_URE | managed;
-
+out:
alpha_pal_imb(); /* XXX overkill? */
+ vm_page_unlock_queues();
+ PMAP_UNLOCK(pmap);
return mpte;
}
==== //depot/projects/smpng/sys/alpha/conf/GENERIC#39 (text+ko) ====
@@ -18,7 +18,7 @@
#
# For hardware specific information check HARDWARE.TXT
#
-# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.172 2004/07/18 09:03:11 maxim Exp $
+# $FreeBSD: src/sys/alpha/conf/GENERIC,v 1.174 2004/08/03 19:24:52 markm Exp $
machine alpha
cpu EV4
@@ -171,8 +171,9 @@
device xl # 3Com 3c90x (``Boomerang'', ``Cyclone'')
# Pseudo devices.
+device loop # Network loopback
+device mem # Memory and kernel memory devices
device random # Entropy device
-device loop # Network loopback
device ether # Ethernet support
device sl # Kernel SLIP
device ppp # Kernel PPP
==== //depot/projects/smpng/sys/alpha/include/cpu.h#11 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.39 2004/06/20 03:52:48 bde Exp $ */
+/* $FreeBSD: src/sys/alpha/include/cpu.h,v 1.40 2004/08/03 18:44:26 mux Exp $ */
/* From: NetBSD: cpu.h,v 1.18 1997/09/23 23:17:49 mjacob Exp */
/*
@@ -93,6 +93,7 @@
#ifdef _KERNEL
#define cpu_getstack(td) (alpha_pal_rdusp())
+#define cpu_spinwait() /* nothing */
#define get_cyclecount alpha_rpcc
void cpu_halt(void);
==== //depot/projects/smpng/sys/alpha/include/param.h#10 (text+ko) ====
@@ -1,4 +1,4 @@
-/* $FreeBSD: src/sys/alpha/include/param.h,v 1.34 2004/07/02 20:21:41 jhb Exp $ */
+/* $FreeBSD: src/sys/alpha/include/param.h,v 1.35 2004/08/01 14:31:45 scottl Exp $ */
/* From: NetBSD: param.h,v 1.20 1997/09/19 13:52:53 leo Exp */
/*
@@ -113,7 +113,10 @@
#define SSIZE 1 /* initial stack size/NBPG */
#define SINCR 1 /* increment of stack/NBPG */
+/* PREEMPTION exposes scheduler bugs that need to be fixed. */
+#if 0
#define PREEMPTION
+#endif
#ifndef KSTACK_PAGES
#define KSTACK_PAGES 2 /* pages of kstack (with pcb) */
==== //depot/projects/smpng/sys/amd64/amd64/amd64_mem.c#6 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.24 2003/12/06 23:19:46 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/amd64_mem.c,v 1.25 2004/08/07 06:21:37 scottl Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -112,6 +112,11 @@
#define MTRRTOMRTLEN (sizeof(amd64_mtrrtomrt) / sizeof(amd64_mtrrtomrt[0]))
+/*
+ * Used in /dev/mem drivers and elsewhere
+ */
+MALLOC_DEFINE(M_MEMDESC, "memdesc", "memory range descriptors");
+
static int
amd64_mtrr2mrt(int val)
{
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list