Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 10 Mar 2009 21:56:06 GMT
From:      John Baldwin <jhb@FreeBSD.org>
To:        Perforce Change Reviews <perforce@freebsd.org>
Subject:   PERFORCE change 159031 for review
Message-ID:  <200903102156.n2ALu6Tq010397@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=159031

Change 159031 by jhb@jhb_jhbbsd on 2009/03/10 21:55:15

	IFC @159027

Affected files ...

.. //depot/projects/smpng/sys/amd64/acpica/madt.c#17 integrate
.. //depot/projects/smpng/sys/amd64/amd64/fpu.c#13 integrate
.. //depot/projects/smpng/sys/amd64/amd64/machdep.c#74 integrate
.. //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#52 integrate
.. //depot/projects/smpng/sys/amd64/amd64/pmap.c#90 integrate
.. //depot/projects/smpng/sys/amd64/amd64/trap.c#64 integrate
.. //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#40 integrate
.. //depot/projects/smpng/sys/amd64/conf/NOTES#49 integrate
.. //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#21 integrate
.. //depot/projects/smpng/sys/amd64/include/fpu.h#5 integrate
.. //depot/projects/smpng/sys/amd64/include/pcb.h#15 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux.h#18 integrate
.. //depot/projects/smpng/sys/amd64/linux32/linux32_sysvec.c#36 integrate
.. //depot/projects/smpng/sys/arm/at91/files.at91#7 integrate
.. //depot/projects/smpng/sys/arm/conf/AVILA#15 integrate
.. //depot/projects/smpng/sys/arm/conf/CAMBRIA#4 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/avila_machdep.c#12 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/files.ixp425#7 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#10 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#10 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci.c#7 integrate
.. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425reg.h#5 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/Makefile#20 integrate
.. //depot/projects/smpng/sys/boot/i386/boot2/boot1.S#7 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/Makefile#18 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/biosdisk.c#18 integrate
.. //depot/projects/smpng/sys/boot/i386/libi386/devicename.c#9 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/Makefile#27 integrate
.. //depot/projects/smpng/sys/boot/i386/loader/main.c#19 integrate
.. //depot/projects/smpng/sys/bsm/audit.h#13 integrate
.. //depot/projects/smpng/sys/bsm/audit_kevents.h#14 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate
.. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sysmacros.h#4 integrate
.. //depot/projects/smpng/sys/compat/freebsd32/freebsd32_misc.c#56 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.c#95 integrate
.. //depot/projects/smpng/sys/compat/linux/linux_misc.h#4 integrate
.. //depot/projects/smpng/sys/compat/ndis/hal_var.h#9 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#43 integrate
.. //depot/projects/smpng/sys/compat/ndis/kern_windrv.c#10 integrate
.. //depot/projects/smpng/sys/compat/ndis/ndis_var.h#29 integrate
.. //depot/projects/smpng/sys/compat/ndis/ntoskrnl_var.h#26 integrate
.. //depot/projects/smpng/sys/compat/ndis/pe_var.h#11 integrate
.. //depot/projects/smpng/sys/compat/ndis/resource_var.h#4 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_hal.c#22 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ndis.c#49 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_ntoskrnl.c#48 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_pe.c#9 integrate
.. //depot/projects/smpng/sys/compat/ndis/subr_usbd.c#7 integrate
.. //depot/projects/smpng/sys/compat/ndis/usbd_var.h#3 integrate
.. //depot/projects/smpng/sys/conf/files#231 integrate
.. //depot/projects/smpng/sys/conf/files.amd64#62 integrate
.. //depot/projects/smpng/sys/conf/files.i386#119 integrate
.. //depot/projects/smpng/sys/conf/files.ia64#63 integrate
.. //depot/projects/smpng/sys/conf/files.mips#6 integrate
.. //depot/projects/smpng/sys/conf/files.pc98#96 integrate
.. //depot/projects/smpng/sys/conf/files.powerpc#48 integrate
.. //depot/projects/smpng/sys/conf/files.sparc64#73 integrate
.. //depot/projects/smpng/sys/conf/files.sun4v#9 integrate
.. //depot/projects/smpng/sys/conf/kern.mk#23 integrate
.. //depot/projects/smpng/sys/ddb/db_expr.c#6 integrate
.. //depot/projects/smpng/sys/dev/agp/agp.c#6 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_amd64.c#3 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_i810.c#7 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_intel.c#2 integrate
.. //depot/projects/smpng/sys/dev/agp/agp_via.c#3 integrate
.. //depot/projects/smpng/sys/dev/agp/agppriv.h#3 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahc_pci.c#22 integrate
.. //depot/projects/smpng/sys/dev/aic7xxx/ahd_pci.c#20 integrate
.. //depot/projects/smpng/sys/dev/ale/if_ale.c#3 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.c#96 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-all.h#62 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#20 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-disk.c#71 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-isa.c#26 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-pci.c#72 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-queue.c#47 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-raid.c#56 integrate
.. //depot/projects/smpng/sys/dev/ata/ata-usb.c#11 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cam.c#39 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#71 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#40 integrate
.. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#41 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-ahci.c#5 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-intel.c#3 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-marvell.c#4 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-promise.c#4 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-sis.c#4 integrate
.. //depot/projects/smpng/sys/dev/ata/chipsets/ata-via.c#3 integrate
.. //depot/projects/smpng/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath.c#70 integrate
.. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#21 integrate
.. //depot/projects/smpng/sys/dev/ath/if_athvar.h#43 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bce.c#26 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bcefw.h#8 integrate
.. //depot/projects/smpng/sys/dev/bce/if_bcereg.h#15 integrate
.. //depot/projects/smpng/sys/dev/cardbus/cardbus.c#37 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_core.c#4 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_dev.c#4 integrate
.. //depot/projects/smpng/sys/dev/cfi/cfi_disk.c#1 branch
.. //depot/projects/smpng/sys/dev/cfi/cfi_var.h#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/bin2h.pl#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_ael1002.c#10 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_common.h#9 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_cpl.h#7 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_t3_hw.c#11 integrate
.. //depot/projects/smpng/sys/dev/cxgb/common/cxgb_xgmac.c#8 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_adapter.h#13 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_ioctl.h#6 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#19 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_sge.c#15 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.c#3 integrate
.. //depot/projects/smpng/sys/dev/cxgb/cxgb_t3fw.h#2 integrate
.. //depot/projects/smpng/sys/dev/cxgb/t3c_protocol_sram.h#1 branch
.. //depot/projects/smpng/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch
.. //depot/projects/smpng/sys/dev/dc/if_dc.c#21 integrate
.. //depot/projects/smpng/sys/dev/drm/drmP.h#22 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_bufs.c#7 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_drv.c#13 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_irq.c#7 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_pciids.h#11 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_scatter.c#7 integrate
.. //depot/projects/smpng/sys/dev/drm/drm_sysctl.c#5 integrate
.. //depot/projects/smpng/sys/dev/drm/i915_dma.c#12 integrate
.. //depot/projects/smpng/sys/dev/drm/i915_drv.c#8 integrate
.. //depot/projects/smpng/sys/dev/drm/i915_drv.h#8 integrate
.. //depot/projects/smpng/sys/dev/drm/i915_irq.c#8 integrate
.. //depot/projects/smpng/sys/dev/drm/mach64_drv.c#6 integrate
.. //depot/projects/smpng/sys/dev/drm/mach64_drv.h#4 integrate
.. //depot/projects/smpng/sys/dev/drm/mach64_irq.c#4 integrate
.. //depot/projects/smpng/sys/dev/drm/mga_dma.c#13 integrate
.. //depot/projects/smpng/sys/dev/drm/mga_drv.c#13 integrate
.. //depot/projects/smpng/sys/dev/drm/mga_irq.c#8 integrate
.. //depot/projects/smpng/sys/dev/drm/r128_drv.c#12 integrate
.. //depot/projects/smpng/sys/dev/drm/r128_drv.h#12 integrate
.. //depot/projects/smpng/sys/dev/drm/r128_irq.c#8 integrate
.. //depot/projects/smpng/sys/dev/drm/r600_cp.c#1 branch
.. //depot/projects/smpng/sys/dev/drm/r600_microcode.h#1 branch
.. //depot/projects/smpng/sys/dev/drm/radeon_cp.c#20 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_drm.h#15 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_drv.c#14 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_drv.h#19 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_irq.c#11 integrate
.. //depot/projects/smpng/sys/dev/drm/radeon_state.c#18 integrate
.. //depot/projects/smpng/sys/dev/drm/savage_drv.c#6 integrate
.. //depot/projects/smpng/sys/dev/drm/sis_drv.c#10 integrate
.. //depot/projects/smpng/sys/dev/drm/tdfx_drv.c#12 integrate
.. //depot/projects/smpng/sys/dev/exca/exca.c#26 integrate
.. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#43 integrate
.. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#88 integrate
.. //depot/projects/smpng/sys/dev/ichwd/ichwd.c#11 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#52 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pccard.c#11 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_pci.c#14 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndis_usb.c#7 integrate
.. //depot/projects/smpng/sys/dev/if_ndis/if_ndisvar.h#22 integrate
.. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#18 integrate
.. //depot/projects/smpng/sys/dev/malo/if_malo_pci.c#2 integrate
.. //depot/projects/smpng/sys/dev/mii/ip1000phy.c#4 integrate
.. //depot/projects/smpng/sys/dev/mii/ip1000phyreg.h#3 integrate
.. //depot/projects/smpng/sys/dev/ofw/ofw_iicbus.c#3 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccard.c#48 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccardvar.h#29 integrate
.. //depot/projects/smpng/sys/dev/pccard/pccardvarp.h#6 integrate
.. //depot/projects/smpng/sys/dev/pci/pci.c#105 integrate
.. //depot/projects/smpng/sys/dev/pci/pci_private.h#24 integrate
.. //depot/projects/smpng/sys/dev/pci/pcireg.h#31 integrate
.. //depot/projects/smpng/sys/dev/pci/vga_pci.c#6 integrate
.. //depot/projects/smpng/sys/dev/puc/puc_pci.c#14 integrate
.. //depot/projects/smpng/sys/dev/puc/pucdata.c#48 integrate
.. //depot/projects/smpng/sys/dev/ral/if_ral_pci.c#8 integrate
.. //depot/projects/smpng/sys/dev/re/if_re.c#72 integrate
.. //depot/projects/smpng/sys/dev/sio/sio_pci.c#20 integrate
.. //depot/projects/smpng/sys/dev/smbus/smbus.c#9 integrate
.. //depot/projects/smpng/sys/dev/smbus/smbus.h#4 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#35 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#9 integrate
.. //depot/projects/smpng/sys/dev/sound/pci/hda/hdac.c#29 integrate
.. //depot/projects/smpng/sys/dev/sound/usb/uaudio.c#23 integrate
.. //depot/projects/smpng/sys/dev/syscons/scterm-teken.c#4 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.c#69 integrate
.. //depot/projects/smpng/sys/dev/syscons/syscons.h#22 integrate
.. //depot/projects/smpng/sys/dev/syscons/teken/teken.c#4 integrate
.. //depot/projects/smpng/sys/dev/syscons/teken/teken.h#4 integrate
.. //depot/projects/smpng/sys/dev/uart/uart_bus_pci.c#11 integrate
.. //depot/projects/smpng/sys/dev/usb/bluetooth/ng_ubt.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ehci_pci.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/ohci_pci.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/controller/uhci_pci.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/image/uscanner.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/input/uhid.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/input/ukbd.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/input/ums.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/misc/udbp.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/misc/ufm.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.h#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uark.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ubsa.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ubser.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uchcom.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ucycom.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ufoma.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uftdi.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ugensa.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uipaq.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/ulpt.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umct.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umodem.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/umoscom.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uplcom.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uslcom.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uvisor.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/serial/uvscom.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/umass.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/urio.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/storage/ustorage_fs.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_compat_linux.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_core.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_dev.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_dev.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_device.h#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_generic.c#4 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hid.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hid.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usb_hub.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/usbdevs#130 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_rumvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#3 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_uralvar.h#3 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#2 integrate
.. //depot/projects/smpng/sys/dev/usb/wlan/if_zydreg.h#2 integrate
.. //depot/projects/smpng/sys/dev/vge/if_vge.c#23 integrate
.. //depot/projects/smpng/sys/dev/xl/if_xl.c#2 integrate
.. //depot/projects/smpng/sys/fs/devfs/devfs_vnops.c#76 integrate
.. //depot/projects/smpng/sys/fs/nullfs/null_vnops.c#39 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_dbregs.c#18 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_fpregs.c#17 integrate
.. //depot/projects/smpng/sys/fs/procfs/procfs_regs.c#17 integrate
.. //depot/projects/smpng/sys/fs/udf/udf_vnops.c#50 integrate
.. //depot/projects/smpng/sys/geom/eli/g_eli.c#25 integrate
.. //depot/projects/smpng/sys/geom/geom_redboot.c#1 branch
.. //depot/projects/smpng/sys/geom/part/g_part_pc98.c#8 integrate
.. //depot/projects/smpng/sys/gnu/fs/reiserfs/reiserfs_fs.h#4 integrate
.. //depot/projects/smpng/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#3 integrate
.. //depot/projects/smpng/sys/i386/acpica/madt.c#24 integrate
.. //depot/projects/smpng/sys/i386/conf/NOTES#140 integrate
.. //depot/projects/smpng/sys/i386/i386/in_cksum.c#9 integrate
.. //depot/projects/smpng/sys/i386/i386/machdep.c#136 integrate
.. //depot/projects/smpng/sys/i386/i386/mp_machdep.c#118 integrate
.. //depot/projects/smpng/sys/i386/i386/trap.c#114 integrate
.. //depot/projects/smpng/sys/i386/include/npx.h#10 integrate
.. //depot/projects/smpng/sys/i386/include/pcb.h#15 integrate
.. //depot/projects/smpng/sys/i386/isa/npx.c#65 integrate
.. //depot/projects/smpng/sys/i386/linux/linux.h#25 integrate
.. //depot/projects/smpng/sys/i386/linux/linux_sysvec.c#65 integrate
.. //depot/projects/smpng/sys/i386/xen/mp_machdep.c#8 integrate
.. //depot/projects/smpng/sys/isa/syscons_isa.c#14 integrate
.. //depot/projects/smpng/sys/kern/kern_conf.c#58 integrate
.. //depot/projects/smpng/sys/kern/kern_priv.c#6 integrate
.. //depot/projects/smpng/sys/kern/kern_prot.c#107 integrate
.. //depot/projects/smpng/sys/kern/kern_sysctl.c#60 integrate
.. //depot/projects/smpng/sys/kern/kern_tc.c#47 integrate
.. //depot/projects/smpng/sys/kern/subr_bus.c#74 integrate
.. //depot/projects/smpng/sys/kern/subr_param.c#27 integrate
.. //depot/projects/smpng/sys/kern/subr_smp.c#54 integrate
.. //depot/projects/smpng/sys/kern/subr_witness.c#178 integrate
.. //depot/projects/smpng/sys/kern/sys_generic.c#57 integrate
.. //depot/projects/smpng/sys/kern/sys_pipe.c#63 integrate
.. //depot/projects/smpng/sys/kern/sys_process.c#64 integrate
.. //depot/projects/smpng/sys/kern/sysv_shm.c#41 integrate
.. //depot/projects/smpng/sys/kern/tty.c#87 integrate
.. //depot/projects/smpng/sys/kern/tty_info.c#5 integrate
.. //depot/projects/smpng/sys/kern/tty_pts.c#16 integrate
.. //depot/projects/smpng/sys/kern/uipc_usrreq.c#86 integrate
.. //depot/projects/smpng/sys/kern/vfs_bio.c#116 integrate
.. //depot/projects/smpng/sys/kern/vfs_cache.c#50 integrate
.. //depot/projects/smpng/sys/kern/vfs_default.c#58 integrate
.. //depot/projects/smpng/sys/kern/vfs_extattr.c#6 integrate
.. //depot/projects/smpng/sys/kern/vfs_mount.c#89 integrate
.. //depot/projects/smpng/sys/kern/vfs_subr.c#163 integrate
.. //depot/projects/smpng/sys/legacy/dev/usb/ehci_pci.c#2 integrate
.. //depot/projects/smpng/sys/legacy/dev/usb/ohci_pci.c#2 integrate
.. //depot/projects/smpng/sys/legacy/dev/usb/uhci_pci.c#2 integrate
.. //depot/projects/smpng/sys/libkern/memmove.c#1 branch
.. //depot/projects/smpng/sys/mips/mips/pmap.c#8 integrate
.. //depot/projects/smpng/sys/modules/drm/radeon/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/if_ndis/Makefile#6 integrate
.. //depot/projects/smpng/sys/modules/ndis/Makefile#8 integrate
.. //depot/projects/smpng/sys/net/bpf.c#82 integrate
.. //depot/projects/smpng/sys/net/bpf_zerocopy.c#4 integrate
.. //depot/projects/smpng/sys/net/if_gif.h#17 integrate
.. //depot/projects/smpng/sys/net/if_var.h#58 integrate
.. //depot/projects/smpng/sys/net/netisr.h#12 integrate
.. //depot/projects/smpng/sys/net/vnet.h#6 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_freebsd.h#16 integrate
.. //depot/projects/smpng/sys/net80211/ieee80211_scan_sta.c#9 integrate
.. //depot/projects/smpng/sys/netgraph/atm/ng_ccatm.h#3 integrate
.. //depot/projects/smpng/sys/netgraph/atm/uni/ng_uni_cust.h#7 integrate
.. //depot/projects/smpng/sys/netgraph/ng_l2tp.c#19 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pppoe.c#34 integrate
.. //depot/projects/smpng/sys/netgraph/ng_pppoe.h#15 integrate
.. //depot/projects/smpng/sys/netinet/if_ether.c#66 integrate
.. //depot/projects/smpng/sys/netinet/igmp.c#26 integrate
.. //depot/projects/smpng/sys/netinet/igmp.h#6 integrate
.. //depot/projects/smpng/sys/netinet/igmp_var.h#7 integrate
.. //depot/projects/smpng/sys/netinet/in.c#49 integrate
.. //depot/projects/smpng/sys/netinet/in.h#45 integrate
.. //depot/projects/smpng/sys/netinet/in_gif.c#26 integrate
.. //depot/projects/smpng/sys/netinet/in_mcast.c#9 integrate
.. //depot/projects/smpng/sys/netinet/in_pcb.h#59 integrate
.. //depot/projects/smpng/sys/netinet/in_proto.c#32 integrate
.. //depot/projects/smpng/sys/netinet/in_var.h#24 integrate
.. //depot/projects/smpng/sys/netinet/ip6.h#11 integrate
.. //depot/projects/smpng/sys/netinet/ip_dummynet.c#53 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw.h#46 integrate
.. //depot/projects/smpng/sys/netinet/ip_fw2.c#105 integrate
.. //depot/projects/smpng/sys/netinet/ip_input.c#95 integrate
.. //depot/projects/smpng/sys/netinet/ip_options.c#12 integrate
.. //depot/projects/smpng/sys/netinet/ip_options.h#3 integrate
.. //depot/projects/smpng/sys/netinet/ip_output.c#104 integrate
.. //depot/projects/smpng/sys/netinet/ip_var.h#39 integrate
.. //depot/projects/smpng/sys/netinet/raw_ip.c#78 integrate
.. //depot/projects/smpng/sys/netinet/sctp_constants.h#20 integrate
.. //depot/projects/smpng/sys/netinet/sctp_indata.c#21 integrate
.. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#21 integrate
.. //depot/projects/smpng/sys/netinet/sctp_output.c#27 integrate
.. //depot/projects/smpng/sys/netinet/tcp_timewait.c#9 integrate
.. //depot/projects/smpng/sys/netinet/udp_usrreq.c#89 integrate
.. //depot/projects/smpng/sys/netinet/vinet.h#6 integrate
.. //depot/projects/smpng/sys/netinet6/in6_gif.c#22 integrate
.. //depot/projects/smpng/sys/netinet6/ip6_output.c#61 integrate
.. //depot/projects/smpng/sys/netinet6/route6.c#14 integrate
.. //depot/projects/smpng/sys/netinet6/vinet6.h#6 integrate
.. //depot/projects/smpng/sys/netipsec/key.c#29 integrate
.. //depot/projects/smpng/sys/netipsec/vipsec.h#5 integrate
.. //depot/projects/smpng/sys/nfsclient/nfs_vnops.c#83 integrate
.. //depot/projects/smpng/sys/pc98/cbus/scterm-sck.c#5 integrate
.. //depot/projects/smpng/sys/pc98/cbus/syscons_cbus.c#6 integrate
.. //depot/projects/smpng/sys/pc98/pc98/machdep.c#29 integrate
.. //depot/projects/smpng/sys/pci/viapm.c#18 integrate
.. //depot/projects/smpng/sys/powerpc/booke/pmap.c#6 integrate
.. //depot/projects/smpng/sys/security/audit/audit.c#17 integrate
.. //depot/projects/smpng/sys/security/audit/audit.h#11 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_errno.c#2 integrate
.. //depot/projects/smpng/sys/security/audit/audit_bsm_token.c#14 integrate
.. //depot/projects/smpng/sys/security/audit/audit_syscalls.c#20 integrate
.. //depot/projects/smpng/sys/security/mac/mac_audit.c#4 integrate
.. //depot/projects/smpng/sys/security/mac/mac_cred.c#2 integrate
.. //depot/projects/smpng/sys/security/mac/mac_framework.c#5 integrate
.. //depot/projects/smpng/sys/security/mac/mac_framework.h#14 integrate
.. //depot/projects/smpng/sys/security/mac/mac_inet.c#13 integrate
.. //depot/projects/smpng/sys/security/mac/mac_internal.h#18 integrate
.. //depot/projects/smpng/sys/security/mac/mac_net.c#22 integrate
.. //depot/projects/smpng/sys/security/mac/mac_pipe.c#14 integrate
.. //depot/projects/smpng/sys/security/mac/mac_policy.h#12 integrate
.. //depot/projects/smpng/sys/security/mac/mac_posix_sem.c#10 integrate
.. //depot/projects/smpng/sys/security/mac/mac_posix_shm.c#3 integrate
.. //depot/projects/smpng/sys/security/mac/mac_priv.c#4 integrate
.. //depot/projects/smpng/sys/security/mac/mac_process.c#20 integrate
.. //depot/projects/smpng/sys/security/mac/mac_socket.c#11 integrate
.. //depot/projects/smpng/sys/security/mac/mac_system.c#12 integrate
.. //depot/projects/smpng/sys/security/mac/mac_sysv_msg.c#9 integrate
.. //depot/projects/smpng/sys/security/mac/mac_sysv_sem.c#9 integrate
.. //depot/projects/smpng/sys/security/mac/mac_sysv_shm.c#8 integrate
.. //depot/projects/smpng/sys/security/mac/mac_vfs.c#22 integrate
.. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#56 integrate
.. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#33 integrate
.. //depot/projects/smpng/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate
.. //depot/projects/smpng/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate
.. //depot/projects/smpng/sys/security/mac_lomac/mac_lomac.c#45 integrate
.. //depot/projects/smpng/sys/security/mac_mls/mac_mls.c#50 integrate
.. //depot/projects/smpng/sys/security/mac_stub/mac_stub.c#30 integrate
.. //depot/projects/smpng/sys/security/mac_test/mac_test.c#46 integrate
.. //depot/projects/smpng/sys/sys/buf.h#52 integrate
.. //depot/projects/smpng/sys/sys/cdefs.h#39 integrate
.. //depot/projects/smpng/sys/sys/fcntl.h#11 integrate
.. //depot/projects/smpng/sys/sys/mbuf.h#80 integrate
.. //depot/projects/smpng/sys/sys/mount.h#72 integrate
.. //depot/projects/smpng/sys/sys/param.h#137 integrate
.. //depot/projects/smpng/sys/sys/pipe.h#12 integrate
.. //depot/projects/smpng/sys/sys/priv.h#15 integrate
.. //depot/projects/smpng/sys/sys/proc.h#194 integrate
.. //depot/projects/smpng/sys/sys/sdt.h#2 integrate
.. //depot/projects/smpng/sys/sys/shm.h#11 integrate
.. //depot/projects/smpng/sys/sys/stat.h#21 integrate
.. //depot/projects/smpng/sys/sys/sysctl.h#56 integrate
.. //depot/projects/smpng/sys/sys/systm.h#91 integrate
.. //depot/projects/smpng/sys/sys/tree.h#11 integrate
.. //depot/projects/smpng/sys/sys/vimage.h#5 integrate
.. //depot/projects/smpng/sys/sys/vnode.h#96 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_snapshot.c#72 integrate
.. //depot/projects/smpng/sys/ufs/ffs/ffs_vfsops.c#111 integrate
.. //depot/projects/smpng/sys/vm/vm_init.c#17 integrate
.. //depot/projects/smpng/sys/vm/vnode_pager.c#69 integrate
.. //depot/projects/smpng/sys/xdr/xdr_mem.c#2 integrate

Differences ...

==== //depot/projects/smpng/sys/amd64/acpica/madt.c#17 (text+ko) ====

@@ -28,7 +28,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.26 2008/03/16 10:58:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.27 2009/03/05 16:03:44 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -483,6 +483,10 @@
 			    apic->Id);
 		if (ioapics[apic->Id].io_apic != NULL)
 			panic("%s: Double APIC ID %u", __func__, apic->Id);
+		if (apic->GlobalIrqBase >= FIRST_MSI_INT) {
+			printf("MADT: Ignoring bogus I/O APIC ID %u", apic->Id);
+			break;
+		}
 		ioapics[apic->Id].io_apic = ioapic_create(apic->Address,
 		    apic->Id, apic->GlobalIrqBase);
 		ioapics[apic->Id].io_vector = apic->GlobalIrqBase;

==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#13 (text+ko) ====

@@ -31,7 +31,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.161 2009/02/23 15:39:24 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/fpu.c,v 1.163 2009/03/05 19:42:11 jhb Exp $");
 
 #include <sys/param.h>
 #include <sys/systm.h>
@@ -102,10 +102,11 @@
     NULL, 1, "Floating point instructions executed in hardware");
 
 static	struct savefpu		fpu_cleanstate;
-static	bool_t			fpu_cleanstate_ready;
 
 /*
- * Initialize floating point unit.
+ * Initialize the floating point unit.  On the boot CPU we generate a
+ * clean state that is used to initialize the floating point unit when
+ * it is first used by a process.
  */
 void
 fpuinit(void)
@@ -115,22 +116,22 @@
 	u_short control;
 
 	savecrit = intr_disable();
-	PCPU_SET(fpcurthread, 0);
 	stop_emulating();
 	fninit();
 	control = __INITIAL_FPUCW__;
 	fldcw(&control);
 	mxcsr = __INITIAL_MXCSR__;
 	ldmxcsr(mxcsr);
-	fxsave(&fpu_cleanstate);
-	if (fpu_cleanstate.sv_env.en_mxcsr_mask)
-		cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask;
-	else
-		cpu_mxcsr_mask = 0xFFBF;
+	if (PCPU_GET(cpuid) == 0) {
+		fxsave(&fpu_cleanstate);
+		if (fpu_cleanstate.sv_env.en_mxcsr_mask)
+			cpu_mxcsr_mask = fpu_cleanstate.sv_env.en_mxcsr_mask;
+		else
+			cpu_mxcsr_mask = 0xFFBF;
+		bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp));
+		bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm));
+	}
 	start_emulating();
-	bzero(fpu_cleanstate.sv_fp, sizeof(fpu_cleanstate.sv_fp));
-	bzero(fpu_cleanstate.sv_xmm, sizeof(fpu_cleanstate.sv_xmm));
-	fpu_cleanstate_ready = 1;
 	intr_restore(savecrit);
 }
 
@@ -384,18 +385,17 @@
 
 static int err_count = 0;
 
-int
-fpudna()
+void
+fpudna(void)
 {
 	struct pcb *pcb;
 	register_t s;
-	u_short control;
 
 	if (PCPU_GET(fpcurthread) == curthread) {
 		printf("fpudna: fpcurthread == curthread %d times\n",
 		    ++err_count);
 		stop_emulating();
-		return (1);
+		return;
 	}
 	if (PCPU_GET(fpcurthread) != NULL) {
 		printf("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n",
@@ -420,16 +420,12 @@
 		 * explicitly load sanitized registers.
 		 */
 		fxrstor(&fpu_cleanstate);
-		if (pcb->pcb_flags & PCB_32BIT) {
-			control = __INITIAL_FPUCW_I386__;
-			fldcw(&control);
-		}
+		if (pcb->pcb_initial_fpucw != __INITIAL_FPUCW__)
+			fldcw(&pcb->pcb_initial_fpucw);
 		pcb->pcb_flags |= PCB_FPUINITDONE;
 	} else
 		fxrstor(&pcb->pcb_save);
 	intr_restore(s);
-
-	return (1);
 }
 
 /*
@@ -457,10 +453,8 @@
 	register_t s;
 
 	if ((td->td_pcb->pcb_flags & PCB_FPUINITDONE) == 0) {
-		if (fpu_cleanstate_ready)
-			bcopy(&fpu_cleanstate, addr, sizeof(fpu_cleanstate));
-		else
-			bzero(addr, sizeof(*addr));
+		bcopy(&fpu_cleanstate, addr, sizeof(fpu_cleanstate));
+		addr->sv_env.en_cw = td->td_pcb->pcb_initial_fpucw;
 		return (_MC_FPOWNED_NONE);
 	}
 	s = intr_disable();

==== //depot/projects/smpng/sys/amd64/amd64/machdep.c#74 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.691 2009/02/03 09:01:45 jkoshy Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.692 2009/03/05 19:42:11 jhb Exp $");
 
 #include "opt_atalk.h"
 #include "opt_atpic.h"
@@ -716,7 +716,7 @@
     idle_sysctl, "A", "currently selected idle function");
 
 /*
- * Clear registers on exec
+ * Reset registers to default values on exec.
  */
 void
 exec_setregs(td, entry, stack, ps_strings)
@@ -743,6 +743,7 @@
 	pcb->pcb_es = _udatasel;
 	pcb->pcb_fs = _udatasel;
 	pcb->pcb_gs = _udatasel;
+	pcb->pcb_initial_fpucw = __INITIAL_FPUCW__;
 
 	bzero((char *)regs, sizeof(struct trapframe));
 	regs->tf_rip = entry;

==== //depot/projects/smpng/sys/amd64/amd64/mp_machdep.c#52 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.299 2009/02/25 22:24:56 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.300 2009/03/08 05:01:39 sobomax Exp $");
 
 #include "opt_cpu.h"
 #include "opt_kstack_pages.h"
@@ -1227,7 +1227,7 @@
 #ifdef SCHED_ULE
 	/*
 	 * SCHED_ULE doesn't allow enabling/disabling HT cores at
-	 * run time.
+	 * run-time.
 	 */
 	if (allowed != hyperthreading_allowed)
 		return (ENOTSUP);

==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#90 (text+ko) ====

@@ -77,7 +77,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.649 2009/02/25 20:26:48 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.653 2009/03/10 02:12:03 alc Exp $");
 
 /*
  *	Manages physical address maps.
@@ -1278,7 +1278,6 @@
 _pmap_unwire_pte_hold(pmap_t pmap, vm_offset_t va, vm_page_t m, 
     vm_page_t *free)
 {
-	vm_offset_t pteva;
 
 	/*
 	 * unmap the page table page
@@ -1287,19 +1286,16 @@
 		/* PDP page */
 		pml4_entry_t *pml4;
 		pml4 = pmap_pml4e(pmap, va);
-		pteva = (vm_offset_t) PDPmap + amd64_ptob(m->pindex - (NUPDE + NUPDPE));
 		*pml4 = 0;
 	} else if (m->pindex >= NUPDE) {
 		/* PD page */
 		pdp_entry_t *pdp;
 		pdp = pmap_pdpe(pmap, va);
-		pteva = (vm_offset_t) PDmap + amd64_ptob(m->pindex - NUPDE);
 		*pdp = 0;
 	} else {
 		/* PTE page */
 		pd_entry_t *pd;
 		pd = pmap_pde(pmap, va);
-		pteva = (vm_offset_t) PTmap + amd64_ptob(m->pindex);
 		*pd = 0;
 	}
 	--pmap->pm_stats.resident_count;
@@ -1325,12 +1321,6 @@
 	 */
 	atomic_subtract_rel_int(&cnt.v_wire_count, 1);
 
-	/*
-	 * Do an invltlb to make the invalidated mapping
-	 * take effect immediately.
-	 */
-	pmap_invalidate_page(pmap, pteva);
-
 	/* 
 	 * Put page on a list so that it is released after
 	 * *ALL* TLB shootdown is done
@@ -2277,9 +2267,10 @@
 	pde_store(pde, newpde);	
 
 	/*
-	 * Invalidate a stale mapping of the page table page.
+	 * Invalidate a stale recursive mapping of the page table page.
 	 */
-	pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va));
+	if (va >= VM_MAXUSER_ADDRESS)
+		pmap_invalidate_page(pmap, (vm_offset_t)vtopte(va));
 
 	/*
 	 * Demote the pv entry.  This depends on the earlier demotion
@@ -3253,17 +3244,12 @@
 					return (mpte);
 			}
 		}
+		pte = (pt_entry_t *)PHYS_TO_DMAP(VM_PAGE_TO_PHYS(mpte));
+		pte = &pte[pmap_pte_index(va)];
 	} else {
 		mpte = NULL;
+		pte = vtopte(va);
 	}
-
-	/*
-	 * This call to vtopte makes the assumption that we are
-	 * entering the page into the current pmap.  In order to support
-	 * quick entry into any pmap, one would likely use pmap_pte.
-	 * But that isn't as quick as vtopte.
-	 */
-	pte = vtopte(va);
 	if (*pte) {
 		if (mpte != NULL) {
 			mpte->wire_count--;
@@ -3481,9 +3467,6 @@
 	if (dst_addr != src_addr)
 		return;
 
-	if (!pmap_is_current(src_pmap))
-		return;
-
 	vm_page_lock_queues();
 	if (dst_pmap < src_pmap) {
 		PMAP_LOCK(dst_pmap);
@@ -3545,14 +3528,16 @@
 			continue;
 		}
 
-		srcmpte = PHYS_TO_VM_PAGE(srcptepaddr & PG_FRAME);
+		srcptepaddr &= PG_FRAME;
+		srcmpte = PHYS_TO_VM_PAGE(srcptepaddr);
 		KASSERT(srcmpte->wire_count > 0,
 		    ("pmap_copy: source page table page is unused"));
 
 		if (va_next > end_addr)
 			va_next = end_addr;
 
-		src_pte = vtopte(addr);
+		src_pte = (pt_entry_t *)PHYS_TO_DMAP(srcptepaddr);
+		src_pte = &src_pte[pmap_pte_index(addr)];
 		while (addr < va_next) {
 			pt_entry_t ptetemp;
 			ptetemp = *src_pte;
@@ -3768,7 +3753,7 @@
 void
 pmap_remove_pages(pmap_t pmap)
 {
-	pd_entry_t *pde;
+	pd_entry_t ptepde;
 	pt_entry_t *pte, tpte;
 	vm_page_t free = NULL;
 	vm_page_t m, mpte, mt;
@@ -3797,21 +3782,19 @@
 				pv = &pc->pc_pventry[idx];
 				inuse &= ~bitmask;
 
-				pde = vtopde(pv->pv_va);
-				tpte = *pde;
-				if ((tpte & PG_PS) != 0)
-					pte = pde;
-				else {
-					pte = vtopte(pv->pv_va);
+				pte = pmap_pdpe(pmap, pv->pv_va);
+				ptepde = *pte;
+				pte = pmap_pdpe_to_pde(pte, pv->pv_va);
+				tpte = *pte;
+				if ((tpte & (PG_PS | PG_V)) == PG_V) {
+					ptepde = tpte;
+					pte = (pt_entry_t *)PHYS_TO_DMAP(tpte &
+					    PG_FRAME);
+					pte = &pte[pmap_pte_index(pv->pv_va)];
 					tpte = *pte & ~PG_PTE_PAT;
 				}
-
-				if (tpte == 0) {
-					printf(
-					    "TPTE at %p  IS ZERO @ VA %08lx\n",
-					    pte, pv->pv_va);
+				if ((tpte & PG_V) == 0)
 					panic("bad pte");
-				}
 
 /*
  * We cannot remove wired pages from a process' mapping at this time
@@ -3867,8 +3850,6 @@
 						pmap_add_delayed_free_list(mpte, &free, FALSE);
 						atomic_subtract_int(&cnt.v_wire_count, 1);
 					}
-					pmap_unuse_pt(pmap, pv->pv_va,
-					    *pmap_pdpe(pmap, pv->pv_va), &free);
 				} else {
 					pmap->pm_stats.resident_count--;
 					TAILQ_REMOVE(&m->md.pv_list, pv, pv_list);
@@ -3877,8 +3858,8 @@
 						if (TAILQ_EMPTY(&pvh->pv_list))
 							vm_page_flag_clear(m, PG_WRITEABLE);
 					}
-					pmap_unuse_pt(pmap, pv->pv_va, *pde, &free);
 				}
+				pmap_unuse_pt(pmap, pv->pv_va, ptepde, &free);
 			}
 		}
 		if (allfree) {
@@ -4495,7 +4476,7 @@
 			if (!pmap_demote_pde(kernel_pmap, pde, tmpva))
 				return (ENOMEM);
 		}
-		pte = vtopte(tmpva);
+		pte = pmap_pde_to_pte(pde, tmpva);
 		if (*pte == 0)
 			return (EINVAL);
 		tmpva += PAGE_SIZE;
@@ -4571,7 +4552,7 @@
 		} else {
 			if (cache_bits_pte < 0)
 				cache_bits_pte = pmap_cache_bits(mode, 0);
-			pte = vtopte(tmpva);
+			pte = pmap_pde_to_pte(pde, tmpva);
 			if ((*pte & PG_PTE_CACHE) != cache_bits_pte) {
 				pmap_pte_attr(pte, cache_bits_pte);
 				if (!changed)

==== //depot/projects/smpng/sys/amd64/amd64/trap.c#64 (text+ko) ====

@@ -38,7 +38,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.328 2008/09/08 09:55:51 kib Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.330 2009/03/09 13:11:16 rwatson Exp $");
 
 /*
  * AMD64 Trap and System call handling
@@ -386,7 +386,6 @@
 #ifdef DEV_ISA
 		case T_NMI:
 			/* machine/parity/power fail/"kitchen sink" faults */
-			/* XXX Giant */
 			if (isa_nmi(code) == 0) {
 #ifdef KDB
 				/*
@@ -416,13 +415,8 @@
 
 		case T_DNA:
 			/* transparent fault (due to context switch "late") */
-			if (fpudna())
-				goto userout;
-			printf("pid %d killed due to lack of floating point\n",
-				p->p_pid);
-			i = SIGKILL;
-			ucode = 0;
-			break;
+			fpudna();
+			goto userout;
 
 		case T_FPOPFLT:		/* FPU operand fetch fault */
 			ucode = ILL_COPROC;
@@ -450,11 +444,9 @@
 			 * XXX this should be fatal unless the kernel has
 			 * registered such use.
 			 */
-			if (fpudna()) {
-				printf("fpudna in kernel mode!\n");
-				goto out;
-			}
-			break;
+			fpudna();
+			printf("fpudna in kernel mode!\n");
+			goto out;
 
 		case T_STKFLT:		/* stack fault */
 			break;
@@ -537,7 +529,6 @@
 
 #ifdef DEV_ISA
 		case T_NMI:
-			/* XXX Giant */
 			/* machine/parity/power fail/"kitchen sink" faults */
 			if (isa_nmi(code) == 0) {
 #ifdef KDB
@@ -827,9 +818,6 @@
 	orig_tf_rflags = frame->tf_rflags;
 
 	if (p->p_sysent->sv_prepsyscall) {
-		/*
-		 * The prep code is MP aware.
-		 */
 		(*p->p_sysent->sv_prepsyscall)(frame, (int *)args, &code, &params);
 	} else {
 		if (code == SYS_syscall || code == SYS___syscall) {
@@ -848,10 +836,6 @@
  		callp = &p->p_sysent->sv_table[code];
 
 	narg = callp->sy_narg;
-
-	/*
-	 * copyin and the ktrsyscall()/ktrsysret() code is MP-aware
-	 */
 	KASSERT(narg <= sizeof(args) / sizeof(args[0]),
 	    ("Too many syscall arguments!"));
 	error = 0;

==== //depot/projects/smpng/sys/amd64/amd64/vm_machdep.c#40 (text+ko) ====

@@ -41,7 +41,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.260 2009/03/02 18:43:50 kib Exp $");
 
 #include "opt_isa.h"
 #include "opt_cpu.h"
@@ -62,6 +62,7 @@
 #include <sys/sf_buf.h>
 #include <sys/smp.h>
 #include <sys/sysctl.h>
+#include <sys/sysent.h>
 #include <sys/unistd.h>
 #include <sys/vnode.h>
 #include <sys/vmmeter.h>
@@ -80,12 +81,6 @@
 
 #include <amd64/isa/isa.h>
 
-#ifdef COMPAT_IA32
-
-extern struct sysentvec ia32_freebsd_sysvec;
-
-#endif
-
 static void	cpu_reset_real(void);
 #ifdef SMP
 static void	cpu_reset_proxy(void);
@@ -331,7 +326,7 @@
 	cpu_thread_clean(td);
 
 #ifdef COMPAT_IA32
-	if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) {
+	if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
 		/*
 	 	 * Set the trap frame to point at the beginning of the uts
 		 * function.
@@ -377,7 +372,7 @@
 		return (EINVAL);
 
 #ifdef COMPAT_IA32
-	if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) {
+	if (td->td_proc->p_sysent->sv_flags & SV_ILP32) {
 		if (td == curthread) {
 			critical_enter();
 			td->td_pcb->pcb_gsbase = (register_t)tls_base;

==== //depot/projects/smpng/sys/amd64/conf/NOTES#49 (text+ko) ====

@@ -4,7 +4,7 @@
 # This file contains machine dependent kernel configuration notes.  For
 # machine independent notes, look in /sys/conf/NOTES.
 #
-# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.87 2009/02/24 00:39:48 thompsa Exp $
+# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.88 2009/03/07 19:54:30 thompsa Exp $
 #
 
 #
@@ -509,5 +509,5 @@
 options 	VM_KMEM_SIZE_SCALE
 
 # Enable NDIS binary driver support
-#options 	NDISAPI
-#device		ndis
+options 	NDISAPI
+device		ndis

==== //depot/projects/smpng/sys/amd64/ia32/ia32_signal.c#21 (text+ko) ====

@@ -32,7 +32,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.20 2009/01/31 11:37:21 obrien Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/ia32/ia32_signal.c,v 1.21 2009/03/05 19:42:11 jhb Exp $");
 
 #include "opt_compat.h"
 
@@ -729,6 +729,7 @@
 	pcb->pcb_es = _udatasel;
 	pcb->pcb_fs = _udatasel;
 	pcb->pcb_gs = _udatasel;
+	pcb->pcb_initial_fpucw = __INITIAL_FPUCW_I386__;
 
 	bzero((char *)regs, sizeof(struct trapframe));
 	regs->tf_rip = entry;

==== //depot/projects/smpng/sys/amd64/include/fpu.h#5 (text+ko) ====

@@ -30,7 +30,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)npx.h	5.3 (Berkeley) 1/18/91
- * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.34 2009/01/28 20:35:16 jhb Exp $
+ * $FreeBSD: src/sys/amd64/include/fpu.h,v 1.35 2009/03/05 16:56:16 jhb Exp $
  */
 
 /*
@@ -97,7 +97,7 @@
 #define	__INITIAL_MXCSR_MASK__	0xFFBF
 
 #ifdef _KERNEL
-int	fpudna(void);
+void	fpudna(void);
 void	fpudrop(void);
 void	fpuexit(struct thread *td);
 int	fpuformat(void);

==== //depot/projects/smpng/sys/amd64/include/pcb.h#15 (text+ko) ====

@@ -31,7 +31,7 @@
  * SUCH DAMAGE.
  *
  *	from: @(#)pcb.h	5.10 (Berkeley) 5/12/91

>>> TRUNCATED FOR MAIL (1000 lines) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903102156.n2ALu6Tq010397>