From owner-p4-projects@FreeBSD.ORG Sun Mar 15 18:10:46 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id E1AFD1065673; Sun, 15 Mar 2009 18:10:45 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 9FFBE1065672 for ; Sun, 15 Mar 2009 18:10:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 8C95D8FC26 for ; Sun, 15 Mar 2009 18:10:45 +0000 (UTC) (envelope-from zec@fer.hr) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n2FIAhmx051952 for ; Sun, 15 Mar 2009 18:10:43 GMT (envelope-from zec@fer.hr) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n2FIAZcD051943 for perforce@freebsd.org; Sun, 15 Mar 2009 18:10:35 GMT (envelope-from zec@fer.hr) Date: Sun, 15 Mar 2009 18:10:35 GMT Message-Id: <200903151810.n2FIAZcD051943@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to zec@fer.hr using -f From: Marko Zec To: Perforce Change Reviews Cc: Subject: PERFORCE change 159255 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 15 Mar 2009 18:10:46 -0000 http://perforce.freebsd.org/chv.cgi?CH=159255 Change 159255 by zec@zec_tpx32 on 2009/03/15 18:10:18 IFC @ 159251 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/acpica/madt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/fpu.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/trap.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/XENHVM#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_signal.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/fpu.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/pcpu.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/hypercall.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/synch_bitops.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/xen-os.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/xenfunc.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/xenpmap.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/include/xen/xenvar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/AVILA#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA.hints#2 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.ixp425#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425reg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/boot2/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/boot2/boot1.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/bioscd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/devicename.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/libi386.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/loader/Makefile#5 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/loader/main.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ia32/ia32_sysvec.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_misc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/hal_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/kern_ndis.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/ntoskrnl_var.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/pe_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/resource_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_hal.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ndis.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/usbd_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sysvec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#17 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#24 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#9 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#14 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.pc98#10 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options#21 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.amd64#3 integrate .. //depot/projects/vimage-commit2/src/sys/conf/options.arm#5 integrate .. //depot/projects/vimage-commit2/src/sys/ddb/db_expr.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_amd64.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_i810.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_intel.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agp_via.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/agp/agppriv.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/ahc_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/ahd_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ale/if_ale.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/amdtemp/amdtemp.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-card.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-cbus.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-isa.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acerlabs.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-siliconimage.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-sis.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-via.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280_attach.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280v1.ini#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9280v2.ini#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcefw.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cardbus/cardbus_cis.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_core.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_dev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_disk.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cfi/cfi_var.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/bin2h.pl#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_ael1002.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_common.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_t3_hw.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/common/cxgb_xgmac.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_ioctl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_multiq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_t3fw.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_t3fw.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/t3c_protocol_sram.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/t3c_tp_eeprom.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/dcons/dcons_os.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_bufs.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pci.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_scatter.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_sysctl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r600_cp.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/drm/r600_microcode.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drm.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_irq.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_state.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/savage_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/sis_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/tdfx_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed_pccard.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/exca/exca.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fe/if_fe_pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/firewire/fwohci_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_pccard.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis_usb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ipw/if_ipw.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/k8temp/k8temp.c#5 delete .. //depot/projects/vimage-commit2/src/sys/dev/malo/if_malo_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/md/md.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/ip1000phy.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mii/ip1000phyreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mmc/mmc.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/card_if.m#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard_cis.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccarddevs#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccbb/pccbb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_pci.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcib_private.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcireg.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/vga_pci.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ppbus/lpbb.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/puc/puc_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/puc/pucdata.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ral/if_ral_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sio/sio_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smbus/smbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/smbus/smbus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/emu10k1.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/emu10kx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-teken.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/syscons.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/teken/teken.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/if_txp.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/if_txpreg.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/uart/uart_bus_pci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_ixp4xx.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg_atmelarm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/usb_controller.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/usb_ethernet.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#20 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/vge/if_vge.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/balloon/balloon.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/blkfront/blkfront.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/console.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/console/xencons_ring.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/netfront/netfront.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/xen/xenpci/evtchn.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/xenpci/machine_reboot.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/xenpci/xenpci.c#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xen/xenpci/xenpcivar.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/xl/if_xl.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_vfsops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/fs/nullfs/null_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vfsops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vnops.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/geom/eli/g_eli.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/geom/geom_redboot.c#1 branch .. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_pc98.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/reiserfs/reiserfs_fs.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/acpica/madt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#14 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/in_cksum.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/trap.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/npx.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/pcb.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/include/xen/xenpmap.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/npx.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_sysvec.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/i386/xen/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/ia64/ia64/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/isa/syscons_isa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_conf.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_ktrace.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_lock.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_mutex.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_tc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_thread.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_umtx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sched_ule.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_bus.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_lock.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_param.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_generic.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_pipe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_shm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_sem.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_bio.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_cache.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_extattr.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vnode_if.src#6 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ehci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/ohci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/uhci_pci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/elf64_machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/elf_machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/modules/Makefile#16 integrate .. //depot/projects/vimage-commit2/src/sys/modules/amdtemp/Makefile#1 branch .. //depot/projects/vimage-commit2/src/sys/modules/drm/radeon/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/if_ndis/Makefile#2 integrate .. //depot/projects/vimage-commit2/src/sys/modules/k8temp/Makefile#2 delete .. //depot/projects/vimage-commit2/src/sys/modules/ndis/Makefile#3 integrate .. //depot/projects/vimage-commit2/src/sys/modules/netgraph/Makefile#4 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf_zerocopy.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#37 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/netisr.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp_var.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#34 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#29 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_constants.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_indata.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_structs.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_timer.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_var.h#8 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctputil.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#32 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#42 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#31 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#28 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#17 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netnatm/natm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/cbus/scterm-sck.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/cbus/syscons_cbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/conf/NOTES#9 integrate .. //depot/projects/vimage-commit2/src/sys/pc98/pc98/machdep.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/spr.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/mpc85xx.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/mpc85xx.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/ocpbus.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_syscalls.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_atalk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_audit.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_cred.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_inet6.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_internal.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_net.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_pipe.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_policy.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_posix_shm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_priv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_process.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_socket.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_syscalls.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_system.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_sysv_msg.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_sysv_sem.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_sysv_shm.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_vfs.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/mac_bsdextended.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/ugidfw_internal.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_bsdextended/ugidfw_vnode.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_mls/mac_mls.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_portacl/mac_portacl.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_stub/mac_stub.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac_test/mac_test.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#9 integrate .. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/elf_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/_pthreadtypes.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/aio.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/buf.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/diskpc98.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/fcntl.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/imgact_elf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/ktrace.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/lock_profile.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mbuf.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#28 integrate .. //depot/projects/vimage-commit2/src/sys/sys/pipe.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/proc.h#11 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sem.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/shm.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/stat.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#16 integrate .. //depot/projects/vimage-commit2/src/sys/sys/syslog.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/systm.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/sys/termios.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/time.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/uio.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#30 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#10 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_snapshot.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vfsops.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/ufs/ufs/inode.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_init.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vnode_pager.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/xen/evtchn/evtchn_dev.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/xen/features.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/features.h#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/xen/gnttab.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/xen/hypervisor.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/arch-x86/xen.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/interface/hvm/params.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/xen/reboot.c#1 branch .. //depot/projects/vimage-commit2/src/sys/xen/xen_intr.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_probe.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/xen/xenbus/xenbus_xs.c#8 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/acpica/madt.c#2 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include -__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 #include @@ -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/vimage-commit2/src/sys/amd64/amd64/elf_machdep.c#4 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include -__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.28 2008/11/22 12:36:15 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.29 2009/03/13 16:40:51 dchagin Exp $"); #include #include @@ -84,7 +84,8 @@ .interp_path = "/libexec/ld-elf.so.1", .sysvec = &elf64_freebsd_sysvec, .interp_newpath = NULL, - .flags = BI_CAN_EXEC_DYN, + .brand_note = &elf64_freebsd_brandnote, + .flags = BI_CAN_EXEC_DYN }; SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY, @@ -99,7 +100,8 @@ .interp_path = "/usr/libexec/ld-elf.so.1", .sysvec = &elf64_freebsd_sysvec, .interp_newpath = NULL, - .flags = BI_CAN_EXEC_DYN, + .brand_note = &elf64_freebsd_brandnote, + .flags = BI_CAN_EXEC_DYN }; SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY, ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/fpu.c#3 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include -__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 #include @@ -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/vimage-commit2/src/sys/amd64/amd64/machdep.c#6 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include -__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.693 2009/03/11 15:30:12 dfr 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; @@ -1493,6 +1494,14 @@ if (env != NULL) strlcpy(kernelname, env, sizeof(kernelname)); +#ifdef XENHVM + if (inw(0x10) == 0x49d2) { + if (bootverbose) + printf("Xen detected: disabling emulated block and network devices\n"); + outw(0x10, 3); + } +#endif + /* Location of kernel stack for locore */ return ((u_int64_t)thread0.td_pcb); } ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#8 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include -__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/vimage-commit2/src/sys/amd64/amd64/pmap.c#12 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include -__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.656 2009/03/14 08:28:02 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 @@ -1452,8 +1442,6 @@ * it isn't already there. */ - pmap->pm_stats.resident_count++; - if (ptepindex >= (NUPDE + NUPDPE)) { pml4_entry_t *pml4; vm_pindex_t pml4index; @@ -1479,7 +1467,8 @@ if (_pmap_allocpte(pmap, NUPDE + NUPDPE + pml4index, flags) == NULL) { --m->wire_count; - vm_page_free(m); + atomic_subtract_int(&cnt.v_wire_count, 1); + vm_page_free_zero(m); return (NULL); } } else { @@ -1511,7 +1500,8 @@ if (_pmap_allocpte(pmap, NUPDE + pdpindex, flags) == NULL) { --m->wire_count; - vm_page_free(m); + atomic_subtract_int(&cnt.v_wire_count, 1); + vm_page_free_zero(m); return (NULL); } pdp = (pdp_entry_t *)PHYS_TO_DMAP(*pml4 & PG_FRAME); @@ -1524,7 +1514,9 @@ if (_pmap_allocpte(pmap, NUPDE + pdpindex, flags) == NULL) { --m->wire_count; - vm_page_free(m); + atomic_subtract_int(&cnt.v_wire_count, + 1); + vm_page_free_zero(m); return (NULL); } } else { @@ -1540,6 +1532,8 @@ *pd = VM_PAGE_TO_PHYS(m) | PG_U | PG_RW | PG_V | PG_A | PG_M; } + pmap->pm_stats.resident_count++; + return m; } @@ -2277,9 +2271,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 @@ -2347,6 +2342,7 @@ mpte = pmap_lookup_pt_page(pmap, sva); if (mpte != NULL) { pmap_remove_pt_page(pmap, mpte); + pmap->pm_stats.resident_count--; KASSERT(mpte->wire_count == NPTEPG, ("pmap_remove_pde: pte page wire count error")); mpte->wire_count = 0; @@ -3253,17 +3249,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 +3472,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 +3533,17 @@ 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)]; + dstmpte = NULL; while (addr < va_next) { pt_entry_t ptetemp; ptetemp = *src_pte; @@ -3560,9 +3551,11 @@ * we only virtual copy managed pages */ if ((ptetemp & PG_MANAGED) != 0) { - dstmpte = pmap_allocpte(dst_pmap, addr, - M_NOWAIT); - if (dstmpte == NULL) + if (dstmpte != NULL && + dstmpte->pindex == pmap_pde_pindex(addr)) + dstmpte->wire_count++; + else if ((dstmpte = pmap_allocpte(dst_pmap, + addr, M_NOWAIT)) == NULL) break; dst_pte = (pt_entry_t *) PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpte)); @@ -3768,7 +3761,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 +3790,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 @@ -3861,14 +3852,13 @@ mpte = pmap_lookup_pt_page(pmap, pv->pv_va); if (mpte != NULL) { pmap_remove_pt_page(pmap, mpte); + pmap->pm_stats.resident_count--; KASSERT(mpte->wire_count == NPTEPG, ("pmap_remove_pages: pte page wire count error")); mpte->wire_count = 0; 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 +3867,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 +4485,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 +4561,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/vimage-commit2/src/sys/amd64/amd64/trap.c#4 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include -__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; >>> TRUNCATED FOR MAIL (1000 lines) <<<