PERFORCE change 129877 for review
Rui Paulo
rpaulo at FreeBSD.org
Sat Dec 1 05:28:59 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=129877
Change 129877 by rpaulo at rpaulo_zoo on 2007/12/01 13:28:47
IFC
Affected files ...
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/exception.S#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/genassym.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/intr_machdep.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/machdep.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/prof_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/trap.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/vm_machdep.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/include/pci_cfgreg.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/busdma_machdep.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/cpufunc.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/pmap.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/trap.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/arm/vm_machdep.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/arm/conf/HL200#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/arm/include/atomic.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/gptboot/gptldr.S#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/libi386/biosdisk.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/i386/pmbr/pmbr.s#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/boot/pc98/cdboot/cdboot.s#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/cam/scsi/scsi_all.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/linprocfs/linprocfs.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/proc.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/compat/opensolaris/sys/types.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/NOTES#19 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files#24 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.amd64#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.i386#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/files.pc98#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/kmod.mk#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/options#16 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/options.amd64#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/conf/options.i386#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/fil.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_auth.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/sys/procset.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_if.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/contrib/pf/net/pf_ioctl.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/acpica/acpi_battery.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_ali.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_amd.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_amd64.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_ati.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_i810.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_if.m#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_intel.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_nvidia.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_sis.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agp_via.c#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agppriv.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agpreg.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/agp/agpvar.h#1 branch
.. //depot/projects/soc2007/rpaulo-macbook/dev/amr/amr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/amr/amr_cam.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/an/if_an.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/an/if_anreg.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-all.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-chipset.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-disk.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-dma.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/ata-pci.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/atapi-fd.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ata/atapi-tape.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/bce/if_bce.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/bfe/if_bfe.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/bge/if_bge.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/dc/dcphy.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/dc/if_dc.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/drm/drmP.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/drm/drm_agpsupport.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_80003es2lan.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_80003es2lan.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82540.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82541.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82541.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82542.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82543.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82543.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82571.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82571.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82575.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_82575.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_api.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_api.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_defines.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_hw.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_ich8lan.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_ich8lan.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_mac.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_mac.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_manage.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_manage.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_nvm.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_nvm.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_osdep.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_phy.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_phy.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/e1000_regs.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.c#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/em/if_em.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/esp/esp_sbus.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ichsmb/ichsmb_pci.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ichwd/ichwd.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ichwd/ichwd.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/lge/if_lge.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mii/amphy.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mii/nsphy.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mii/rlphy.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mii/tdkphy.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/msk/if_msk.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/msk/if_mskreg.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/nge/if_nge.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/nve/if_nve.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/pci/pci.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/random/yarrow.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/re/if_re.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sio/sio_isa.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sio/sio_puc.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sk/if_sk.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/sound/pci/hda/hdac.c#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/stge/if_stge.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/ti/if_ti.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/txp/if_txp.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/ehci_pci.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_axe.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_axereg.h#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_rum.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/if_zyd.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/uhci_pci.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usb_quirks.c#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/usb/usbdevs#23 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/vge/if_vge.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/wpi/if_wpi.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/dev/wpi/if_wpireg.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/msdosfs/msdosfs_vfsops.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/ntfs/ntfs_ihash.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/ntfs/ntfs_vfsops.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs.h#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_subr.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vfsops.c#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/fs/tmpfs/tmpfs_vnops.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/geom/eli/g_eli_crypto.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/geom/label/g_label_reiserfs.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/bios/apm.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/conf/GENERIC#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/conf/XBOX#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/busdma_machdep.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/genassym.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/intr_machdep.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/locore.s#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/machdep.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/mp_machdep.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/pmap.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/trap.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/i386/vm_machdep.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/include/pmap.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/isa/prof_machdep.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/linux/linux_machdep.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/i386/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/busdma_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/interrupt.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/machdep.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/pmap.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/trap.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/ia64/vm_machdep.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ia64/include/atomic.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/imgact_elf.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/init_main.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_clock.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_exec.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_fork.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_kse.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_kthread.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_ktrace.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_linker.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_lock.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_mutex.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_proc.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_rmlock.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_rwlock.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_switch.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sx.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_synch.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_sysctl.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_thr.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_thread.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_timeout.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/kern_umtx.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/linker_if.m#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/p1003_1b.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/sched_4bsd.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/sched_ule.c#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_bus.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_pcpu.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_sleepqueue.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_trap.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_turnstile.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/subr_witness.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/sys_generic.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/sys_pipe.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/tty_pty.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/kern/vfs_cache.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/agp/Makefile#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/modules/zfs/Makefile#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/ieee8023ad_lacp.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/if_enc.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/if_lagg.c#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/pfil.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net/pfil.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_node.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_output.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_proto.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_scan_sta.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/net80211/ieee80211_var.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netatalk/aarp.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netatalk/ddp_output.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/netgraph.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_base.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netgraph/ng_cisco.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/ip_dummynet.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/libalias/alias_util.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_output.c#9 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_subr.c#16 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet/tcp_syncache.c#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netinet6/ip6_output.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_input.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/ipsec_output.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/keysock.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/xform.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/netipsec/xform_ipip.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/nfsclient/nfs_vnops.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pc98/pc98/machdep.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp.c#4 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_ali.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_amd.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_amd64.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_ati.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_i810.c#4 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_if.m#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_intel.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_nvidia.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_sis.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agp_via.c#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agppriv.h#4 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agpreg.h#3 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/agpvar.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/pci/if_rl.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pci/if_rlreg.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pci/if_sf.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pci/if_ste.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pci/if_vr.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pci/if_xl.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/pci/nfsmb.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/include/atomic.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/include/md_var.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/clock.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/intr_machdep.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/machdep.c#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/mmu_if.m#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/mmu_oea.c#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/pmap_dispatch.c#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/trap.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/powerpc/powerpc/vm_machdep.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/conf/DEFAULTS#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/conf/GENERIC#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/ofw_pcibus.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psycho.c#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/pci/psychovar.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/intr_machdep.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/pmap.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sparc64/sparc64/vm_machdep.c#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/conf/GENERIC#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/pcpu.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/include/stdarg.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/pmap.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/trap.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sun4v/sun4v/vm_machdep.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/_elf_solaris.h#2 delete
.. //depot/projects/soc2007/rpaulo-macbook/sys/callout.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/elf.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/eventhandler.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/kernel.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/linker.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/lock.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/lockmgr.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/malloc.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/mutex.h#6 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/param.h#12 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/pcpu.h#4 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/proc.h#8 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/resource.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/rmlock.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/signal.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/stat.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/sysctl.h#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/time.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/types.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/sys/umtx.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/ufs/ffs/ffs_alloc.c#5 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/pmap.h#3 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_contig.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_object.c#7 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_page.c#11 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.c#10 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vm_pageout.h#2 integrate
.. //depot/projects/soc2007/rpaulo-macbook/vm/vnode_pager.c#6 integrate
Differences ...
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/busdma_machdep.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.83 2007/06/17 04:21:58 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.84 2007/11/27 17:28:11 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -580,7 +580,6 @@
bus_addr_t curaddr, lastaddr, baddr, bmask;
vm_offset_t vaddr;
bus_addr_t paddr;
- int needbounce = 0;
int seg;
if (map == NULL)
@@ -604,10 +603,8 @@
while (vaddr < vendaddr) {
paddr = pmap_kextract(vaddr);
- if (run_filter(dmat, paddr) != 0) {
- needbounce = 1;
+ if (run_filter(dmat, paddr) != 0)
map->pagesneeded++;
- }
vaddr += PAGE_SIZE;
}
CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
@@ -679,7 +676,7 @@
segs[seg].ds_len = sgsize;
first = 0;
} else {
- if (needbounce == 0 && curaddr == lastaddr &&
+ if (curaddr == lastaddr &&
(segs[seg].ds_len + sgsize) <= dmat->maxsegsz &&
(dmat->boundary == 0 ||
(segs[seg].ds_addr & bmask) == (curaddr & bmask)))
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/db_trace.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.80 2006/11/17 20:27:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.81 2007/11/15 22:00:56 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -317,7 +317,8 @@
if (name != NULL) {
if (strcmp(name, "calltrap") == 0 ||
strcmp(name, "fork_trampoline") == 0 ||
- strcmp(name, "nmi_calltrap") == 0)
+ strcmp(name, "nmi_calltrap") == 0 ||
+ strcmp(name, "Xdblfault") == 0)
frame_type = TRAP;
else if (strncmp(name, "Xatpic_intr", 11) == 0 ||
strncmp(name, "Xapic_isr", 9) == 0 ||
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/exception.S#2 (text+ko) ====
@@ -27,7 +27,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.129 2006/12/23 03:30:50 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.130 2007/11/15 22:00:56 jhb Exp $
*/
#include "opt_atpic.h"
@@ -187,10 +187,28 @@
IDTVEC(dblfault)
subq $TF_ERR,%rsp
movq $T_DOUBLEFLT,TF_TRAPNO(%rsp)
+ movq $0,TF_ADDR(%rsp)
+ movq $0,TF_ERR(%rsp)
+ movq %rdi,TF_RDI(%rsp)
+ movq %rsi,TF_RSI(%rsp)
+ movq %rdx,TF_RDX(%rsp)
+ movq %rcx,TF_RCX(%rsp)
+ movq %r8,TF_R8(%rsp)
+ movq %r9,TF_R9(%rsp)
+ movq %rax,TF_RAX(%rsp)
+ movq %rbx,TF_RBX(%rsp)
+ movq %rbp,TF_RBP(%rsp)
+ movq %r10,TF_R10(%rsp)
+ movq %r11,TF_R11(%rsp)
+ movq %r12,TF_R12(%rsp)
+ movq %r13,TF_R13(%rsp)
+ movq %r14,TF_R14(%rsp)
+ movq %r15,TF_R15(%rsp)
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 1f /* already running with kernel GS.base */
swapgs
-1: call dblfault_handler
+1: movq %rsp, %rdi
+ call dblfault_handler
2: hlt
jmp 2b
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/genassym.c#4 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.165 2007/09/17 21:55:28 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.166 2007/11/23 03:03:29 jkoshy Exp $");
#include "opt_compat.h"
#include "opt_kstack_pages.h"
@@ -78,12 +78,15 @@
ASSYM(TD_LOCK, offsetof(struct thread, td_lock));
ASSYM(TD_FLAGS, offsetof(struct thread, td_flags));
ASSYM(TD_PCB, offsetof(struct thread, td_pcb));
+ASSYM(TD_PFLAGS, offsetof(struct thread, td_pflags));
ASSYM(TD_PROC, offsetof(struct thread, td_proc));
ASSYM(TD_TID, offsetof(struct thread, td_tid));
ASSYM(TDF_ASTPENDING, TDF_ASTPENDING);
ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED);
+ASSYM(TDP_CALLCHAIN, TDP_CALLCHAIN);
+
ASSYM(V_TRAP, offsetof(struct vmmeter, v_trap));
ASSYM(V_SYSCALL, offsetof(struct vmmeter, v_syscall));
ASSYM(V_INTR, offsetof(struct vmmeter, v_intr));
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/intr_machdep.c#5 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.34 2007/06/04 21:38:44 attilio Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.35 2007/11/21 04:03:50 scottl Exp $
*/
/*
@@ -390,13 +390,13 @@
isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
else
isrc->is_pic->pic_eoi_source(isrc);
- critical_exit();
/* Schedule the ithread if needed. */
if (thread) {
error = intr_event_schedule_thread(ie);
KASSERT(error == 0, ("bad stray interrupt"));
}
+ critical_exit();
td->td_intr_nesting_level--;
}
#endif
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/machdep.c#5 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.677 2007/11/05 11:36:09 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.678 2007/11/15 22:00:57 jhb Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -138,7 +138,6 @@
CTASSERT(offsetof(struct pcpu, pc_curthread) == 0);
extern u_int64_t hammer_time(u_int64_t, u_int64_t);
-extern void dblfault_handler(void);
extern void printcpuinfo(void); /* XXX header file */
extern void identify_cpu(void);
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/pmap.c#10 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.593 2007/11/05 18:13:33 alc Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.596 2007/11/30 07:14:42 alc Exp $");
/*
* Manages physical address maps.
@@ -1733,6 +1733,7 @@
TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
dump_drop_page(m->phys_addr);
+ vm_page_unwire(m, 0);
vm_page_free(m);
}
@@ -1746,6 +1747,7 @@
static const struct timeval printinterval = { 60, 0 };
static struct timeval lastprint;
static vm_pindex_t colour;
+ struct vpgqueues *pq;
int bit, field;
pv_entry_t pv;
struct pv_chunk *pc;
@@ -1760,6 +1762,8 @@
printf("Approaching the limit on PV entries, consider "
"increasing either the vm.pmap.shpgperproc or the "
"vm.pmap.pv_entry_max sysctl.\n");
+ pq = NULL;
+retry:
pc = TAILQ_FIRST(&pmap->pm_pvchunk);
if (pc != NULL) {
for (field = 0; field < _NPCM; field++) {
@@ -1782,7 +1786,9 @@
}
}
/* No free items, allocate another chunk */
- m = vm_page_alloc(NULL, colour, VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ);
+ m = vm_page_alloc(NULL, colour, (pq == &vm_page_queues[PQ_ACTIVE] ?
+ VM_ALLOC_SYSTEM : VM_ALLOC_NORMAL) | VM_ALLOC_NOOBJ |
+ VM_ALLOC_WIRED);
if (m == NULL) {
if (try) {
pv_entry_count--;
@@ -1794,18 +1800,16 @@
* pages. After that, if a pv chunk entry is still needed,
* destroy mappings to active pages.
*/
- PV_STAT(pmap_collect_inactive++);
- pmap_collect(pmap, &vm_page_queues[PQ_INACTIVE]);
- m = vm_page_alloc(NULL, colour,
- VM_ALLOC_NORMAL | VM_ALLOC_NOOBJ);
- if (m == NULL) {
+ if (pq == NULL) {
+ PV_STAT(pmap_collect_inactive++);
+ pq = &vm_page_queues[PQ_INACTIVE];
+ } else if (pq == &vm_page_queues[PQ_INACTIVE]) {
PV_STAT(pmap_collect_active++);
- pmap_collect(pmap, &vm_page_queues[PQ_ACTIVE]);
- m = vm_page_alloc(NULL, colour,
- VM_ALLOC_SYSTEM | VM_ALLOC_NOOBJ);
- if (m == NULL)
- panic("get_pv_entry: increase vm.pmap.shpgperproc");
- }
+ pq = &vm_page_queues[PQ_ACTIVE];
+ } else
+ panic("get_pv_entry: increase vm.pmap.shpgperproc");
+ pmap_collect(pmap, pq);
+ goto retry;
}
PV_STAT(pc_chunk_count++);
PV_STAT(pc_chunk_allocs++);
@@ -2925,6 +2929,35 @@
}
/*
+ * pmap_page_wired_mappings:
+ *
+ * Return the number of managed mappings to the given physical page
+ * that are wired.
+ */
+int
+pmap_page_wired_mappings(vm_page_t m)
+{
+ pv_entry_t pv;
+ pt_entry_t *pte;
+ pmap_t pmap;
+ int count;
+
+ count = 0;
+ if ((m->flags & PG_FICTITIOUS) != 0)
+ return (count);
+ mtx_assert(&vm_page_queue_mtx, MA_OWNED);
+ TAILQ_FOREACH(pv, &m->md.pv_list, pv_list) {
+ pmap = PV_PMAP(pv);
+ PMAP_LOCK(pmap);
+ pte = pmap_pte(pmap, pv->pv_va);
+ if ((*pte & PG_W) != 0)
+ count++;
+ PMAP_UNLOCK(pmap);
+ }
+ return (count);
+}
+
+/*
* Remove all pages from specified address space
* this aids process exit speeds. Also, this code
* is special cased for current process only, but
@@ -3019,6 +3052,7 @@
TAILQ_REMOVE(&pmap->pm_pvchunk, pc, pc_list);
m = PHYS_TO_VM_PAGE(DMAP_TO_PHYS((vm_offset_t)pc));
dump_drop_page(m->phys_addr);
+ vm_page_unwire(m, 0);
vm_page_free(m);
}
}
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/prof_machdep.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.29 2007/03/26 18:03:29 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/prof_machdep.c,v 1.31 2007/11/29 02:01:21 bde Exp $");
#ifdef GUPROF
#if 0
@@ -82,10 +82,10 @@
# Check that we are profiling. Do it early for speed. \n\
# \n\
cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\
- je .mcount_exit \n\
- # \n\
- # __mcount is the same as [.]mcount except the caller \n\
- # hasn't changed the stack except to call here, so the \n\
+ je .mcount_exit \n\
+ # \n\
+ # __mcount is the same as [.]mcount except the caller \n\
+ # hasn't changed the stack except to call here, so the \n\
# caller's raddr is above our raddr. \n\
# \n\
pushq %rax \n\
@@ -96,13 +96,11 @@
pushq %r8 \n\
pushq %r9 \n\
movq 7*8+8(%rsp),%rdi \n\
- jmp .got_frompc \n\
- \n\
- .p2align 4,0x90 \n\
- .globl .mcount \n\
+ jmp .got_frompc \n\
+ \n\
+ .p2align 4,0x90 \n\
+ .globl .mcount \n\
.mcount: \n\
- .globl __cyg_profile_func_enter \n\
-__cyg_profile_func_enter: \n\
cmpl $GMON_PROF_OFF,_gmonparam+GM_STATE \n\
je .mcount_exit \n\
# \n\
@@ -137,7 +135,7 @@
popq %rdx \n\
popq %rax \n\
.mcount_exit: \n\
- ret \n\
+ ret $0 \n\
");
#else /* !__GNUCLIKE_ASM */
#error "this file needs to be ported to your compiler"
@@ -167,8 +165,6 @@
.p2align 4,0x90 \n\
.globl .mexitcount \n\
.mexitcount: \n\
- .globl __cyg_profile_func_exit \n\
-__cyg_profile_func_exit: \n\
cmpl $GMON_PROF_HIRES,_gmonparam+GM_STATE \n\
jne .mexitcount_exit \n\
pushq %rax \n\
@@ -191,7 +187,7 @@
popq %rdx \n\
popq %rax \n\
.mexitcount_exit: \n\
- ret \n\
+ ret $0 \n\
");
#endif /* __GNUCLIKE_ASM */
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/trap.c#6 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.319 2007/07/26 15:32:54 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.322 2007/11/15 22:00:57 jhb Exp $");
/*
* AMD64 Trap and System call handling
@@ -96,10 +96,10 @@
extern void trap(struct trapframe *frame);
extern void syscall(struct trapframe *frame);
+void dblfault_handler(struct trapframe *frame);
static int trap_pfault(struct trapframe *, int);
static void trap_fatal(struct trapframe *, vm_offset_t);
-void dblfault_handler(void);
#define MAX_TRAP_MSG 30
static char *trap_msg[] = {
@@ -208,7 +208,7 @@
if (ISPL(frame->tf_cs) == SEL_UPL)
printf(
"pid %ld (%s): trap %d with interrupts disabled\n",
- (long)curproc->p_pid, curproc->p_comm, type);
+ (long)curproc->p_pid, curthread->td_name, type);
else if (type != T_NMI && type != T_BPTFLT &&
type != T_TRCTRAP) {
/*
@@ -681,8 +681,8 @@
printf("current process = ");
if (curproc) {
printf("%lu (%s)\n",
- (u_long)curproc->p_pid, curproc->p_comm ?
- curproc->p_comm : "");
+ (u_long)curproc->p_pid, curthread->td_name ?
+ curthread->td_name : "");
} else {
printf("Idle\n");
}
@@ -706,9 +706,12 @@
* for example).
*/
void
-dblfault_handler()
+dblfault_handler(struct trapframe *frame)
{
printf("\nFatal double fault\n");
+ printf("rip = 0x%lx\n", frame->tf_rip);
+ printf("rsp = 0x%lx\n", frame->tf_rsp);
+ printf("rbp = 0x%lx\n", frame->tf_rbp);
#ifdef SMP
/* two separate prints in case of a trap on an unmapped page */
printf("cpuid = %d; ", PCPU_GET(cpuid));
@@ -806,7 +809,7 @@
#endif
CTR4(KTR_SYSC, "syscall enter thread %p pid %d proc %s code %d", td,
- td->td_proc->p_pid, td->td_proc->p_comm, code);
+ td->td_proc->p_pid, td->td_name, code);
td->td_syscalls++;
@@ -888,7 +891,7 @@
userret(td, frame);
CTR4(KTR_SYSC, "syscall exit thread %p pid %d proc %s code %d", td,
- td->td_proc->p_pid, td->td_proc->p_comm, code);
+ td->td_proc->p_pid, td->td_name, code);
#ifdef KTRACE
if (KTRPOINT(td, KTR_SYSRET))
==== //depot/projects/soc2007/rpaulo-macbook/amd64/amd64/vm_machdep.c#4 (text+ko) ====
@@ -41,7 +41,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.255 2007/06/04 23:57:29 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.256 2007/11/14 20:21:52 marcel Exp $");
#include "opt_isa.h"
#include "opt_cpu.h"
@@ -240,7 +240,7 @@
}
void
-cpu_thread_setup(struct thread *td)
+cpu_thread_alloc(struct thread *td)
{
td->td_pcb = (struct pcb *)(td->td_kstack +
@@ -248,6 +248,11 @@
td->td_frame = (struct trapframe *)td->td_pcb - 1;
}
+void
+cpu_thread_free(struct thread *td)
+{
+}
+
/*
* Initialize machine state (pcb and trap frame) for a new thread about to
* upcall. Put enough state in the new thread's PCB to get it to go back
==== //depot/projects/soc2007/rpaulo-macbook/amd64/conf/GENERIC#7 (text+ko) ====
@@ -16,7 +16,7 @@
# If you are in doubt as to the purpose or necessity of a line, check first
# in NOTES.
#
-# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.487 2007/10/26 02:35:42 imp Exp $
+# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.488 2007/11/28 05:50:44 attilio Exp $
cpu HAMMER
ident GENERIC
@@ -59,7 +59,6 @@
options SYSVSEM # SYSV-style semaphores
options _KPOSIX_PRIORITY_SCHEDULING # POSIX P1003_1B real-time extensions
options KBD_INSTALL_CDEV # install a CDEV entry in /dev
-options ADAPTIVE_GIANT # Giant mutex is adaptive.
options STOP_NMI # Stop CPUS using NMI instead of IPI
options AUDIT # Security event auditing
==== //depot/projects/soc2007/rpaulo-macbook/amd64/include/pci_cfgreg.h#2 (text+ko) ====
@@ -23,7 +23,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/amd64/include/pci_cfgreg.h,v 1.13 2005/01/05 20:17:20 imp Exp $
+ * $FreeBSD: src/sys/amd64/include/pci_cfgreg.h,v 1.14 2007/11/28 22:20:07 jhb Exp $
*
*/
@@ -37,11 +37,6 @@
#define CONF1_ENABLE_MSK1 0x80000001ul
#define CONF1_ENABLE_RES1 0x80000000ul
-#define CONF2_ENABLE_PORT 0x0cf8
-#define CONF2_FORWARD_PORT 0x0cfa
-#define CONF2_ENABLE_CHK 0x0e
-#define CONF2_ENABLE_RES 0x0e
-
int pci_cfgregopen(void);
u_int32_t pci_cfgregread(int bus, int slot, int func, int reg, int bytes);
void pci_cfgregwrite(int bus, int slot, int func, int reg, u_int32_t data, int bytes);
==== //depot/projects/soc2007/rpaulo-macbook/amd64/pci/pci_cfgreg.c#2 (text+ko) ====
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.109 2005/10/25 04:53:29 wpaul Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.110 2007/11/28 22:20:08 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -38,12 +38,8 @@
#include <dev/pci/pcireg.h>
#include <machine/pci_cfgreg.h>
-static int cfgmech;
-static int devmax;
-
static int pcireg_cfgread(int bus, int slot, int func, int reg, int bytes);
static void pcireg_cfgwrite(int bus, int slot, int func, int reg, int data, int bytes);
-static int pcireg_cfgopen(void);
static struct mtx pcicfg_mtx;
@@ -57,8 +53,6 @@
if (opened)
return (1);
- if (pcireg_cfgopen() == 0)
- return (0);
mtx_init(&pcicfg_mtx, "pcicfg", NULL, MTX_SPIN);
opened = 1;
return (1);
@@ -109,26 +103,12 @@
{
int dataport = 0;
- if (bus <= PCI_BUSMAX
- && slot < devmax
- && func <= PCI_FUNCMAX
- && reg <= PCI_REGMAX
- && bytes != 3
- && (unsigned) bytes <= 4
- && (reg & (bytes - 1)) == 0) {
- switch (cfgmech) {
- case 1:
- outl(CONF1_ADDR_PORT, (1 << 31)
- | (bus << 16) | (slot << 11)
- | (func << 8) | (reg & ~0x03));
- dataport = CONF1_DATA_PORT + (reg & 0x03);
- break;
- case 2:
- outb(CONF2_ENABLE_PORT, 0xf0 | (func << 1));
- outb(CONF2_FORWARD_PORT, bus);
- dataport = 0xc000 | (slot << 8) | reg;
- break;
- }
+ if (bus <= PCI_BUSMAX && slot < 32 && func <= PCI_FUNCMAX &&
+ reg <= PCI_REGMAX && bytes != 3 && (unsigned) bytes <= 4 &&
+ (reg & (bytes - 1)) == 0) {
+ outl(CONF1_ADDR_PORT, (1 << 31) | (bus << 16) | (slot << 11)
+ | (func << 8) | (reg & ~0x03));
+ dataport = CONF1_DATA_PORT + (reg & 0x03);
}
return (dataport);
}
@@ -137,19 +117,11 @@
static void
pci_cfgdisable(void)
{
- switch (cfgmech) {
- case 1:
- /*
- * Do nothing for the config mechanism 1 case.
- * Writing a 0 to the address port can apparently
- * confuse some bridges and cause spurious
- * access failures.
- */
- break;
- case 2:
- outb(CONF2_ENABLE_PORT, 0);
- break;
- }
+
+ /*
+ * Do nothing. Writing a 0 to the address port can apparently
+ * confuse some bridges and cause spurious access failures.
+ */
}
static int
@@ -201,131 +173,3 @@
}
mtx_unlock_spin(&pcicfg_mtx);
}
-
-/* check whether the configuration mechanism has been correctly identified */
-static int
-pci_cfgcheck(int maxdev)
-{
- uint32_t id, class;
- uint8_t header;
- uint8_t device;
- int port;
-
- if (bootverbose)
- printf("pci_cfgcheck:\tdevice ");
-
- for (device = 0; device < maxdev; device++) {
- if (bootverbose)
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list