Date: Sat, 23 May 2009 22:15:58 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 162615 for review Message-ID: <200905232215.n4NMFwdI019072@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=162615 Change 162615 by zec@zec_tpx32 on 2009/05/23 22:15:12 IFC @ 162613 Affected files ... .. //depot/projects/vimage-commit/src/sys/Makefile#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#9 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mca.c#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#12 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/vimage-commit/src/sys/amd64/amd64/trap.c#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC.hints#4 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/mca.h#1 branch .. //depot/projects/vimage-commit/src/sys/amd64/include/param.h#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/smp.h#6 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/specialreg.h#7 integrate .. //depot/projects/vimage-commit/src/sys/amd64/include/vmparam.h#5 integrate .. //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#8 integrate .. //depot/projects/vimage-commit/src/sys/amd64/pci/pci_cfgreg.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#7 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/at91_spi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/arm/at91/if_ate.c#6 integrate .. //depot/projects/vimage-commit/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate .. //depot/projects/vimage-commit/src/sys/boot/forth/loader.conf#10 integrate .. //depot/projects/vimage-commit/src/sys/boot/i386/zfsboot/zfsboot.c#2 integrate .. //depot/projects/vimage-commit/src/sys/boot/zfs/zfsimpl.c#3 integrate .. //depot/projects/vimage-commit/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_pass.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cam/scsi/scsi_sg.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/boot/zfs/README#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/boot/zfs/zfsimpl.h#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/boot/zfs/zfssubr.c#2 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/mutex.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/compat/opensolaris/sys/rwlock.h#3 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/common/zfs/zfs_prop.c#4 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#7 integrate .. //depot/projects/vimage-commit/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.c#13 integrate .. //depot/projects/vimage-commit/src/sys/compat/linux/linux_socket.h#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/kern_windrv.c#4 integrate .. //depot/projects/vimage-commit/src/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/vimage-commit/src/sys/compat/svr4/svr4_misc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/conf/NOTES#18 integrate .. //depot/projects/vimage-commit/src/sys/conf/files#26 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.amd64#9 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.i386#13 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.pc98#8 integrate .. //depot/projects/vimage-commit/src/sys/conf/files.powerpc#9 integrate .. //depot/projects/vimage-commit/src/sys/conf/options#16 integrate .. //depot/projects/vimage-commit/src/sys/contrib/altq/altq/altq_subr.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/aac/aac.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_ibm.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpi_support/acpi_sony.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/acpica/acpi.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/age/if_age.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/aic/aic.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/amr/amr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/amr/amr_linux.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/arcmsr/arcmsr.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-all.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-pci.h#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/ata-usb.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/atapi-cam.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-acard.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ah_internal.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5210/ar5210_interrupts.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5211/ar5211_interrupts.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212_interrupts.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5212/ar5212reg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_ath_pci.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ath/if_athvar.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/bge/if_bge.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/bwi/bwiphy.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/bwi/if_bwi.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/bwi/if_bwi_pci.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/bwi/if_bwireg.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/bwi/if_bwivar.h#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/ciss/ciss.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_ael1002.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_common.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/common/cxgb_t3_hw.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_adapter.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_main.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/cxgb/cxgb_sge.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/e1000/if_em.c#11 integrate .. //depot/projects/vimage-commit/src/sys/dev/ed/if_ed.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/ep/if_ep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/flash/at45d.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis.c#12 integrate .. //depot/projects/vimage-commit/src/sys/dev/if_ndis/if_ndis_usb.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/iir/iir_ctrl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iir/iir_pci.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ipw/if_ipw.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/ipw/if_ipwvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwi.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwi/if_iwivar.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwn.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/iwn/if_iwnvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ixgb/if_ixgb.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/lmc/if_lmc.c#9 integrate .. //depot/projects/vimage-commit/src/sys/dev/malo/if_malo.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/malo/if_malo.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/malo/if_malo_pci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/md/md.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/mfi/mfi_linux.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/mpt/mpt_raid.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/mpt/mpt_user.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/nge/if_nge.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/nge/if_ngereg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci.c#10 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pci_pci.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/pci/pcib_if.m#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2560.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2560var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2661.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/ral/rt2661var.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/snp/snp.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/midi/midi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/emu10kx-midi.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/pci/via82c686.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/sbus/cs4231.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudio.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/sound/usb/uaudioreg.h#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/spibus/spibus.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/syscons/syscons.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/twe/twe_freebsd.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/README.TXT#2 delete .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ng_ubt.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/bluetooth/ubtbcmfw.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/at91dci.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/atmegadci.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/avr32dci.c#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/avr32dci.h#1 branch .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ehci.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/musb_otg.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/ohci.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uhci.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/usb_controller.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/controller/uss820dci_atmelarm.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/uhid.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ukbd.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/input/ums.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/misc/udbp.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_aue.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_axe.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cdce.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_cue.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_kue.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_rue.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/net/if_udav.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/u3g.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uark.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubsa.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ubser.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uchcom.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ucycom.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ufoma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uftdi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ugensa.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uipaq.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/ulpt.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umct.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umodem.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/umoscom.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uplcom.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/usb_serial.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uslcom.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvisor.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/serial/uvscom.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/umass.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/urio.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/storage/ustorage_fs.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/template/usb_template.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_bus.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_busdma.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_compat_linux.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_controller.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_core.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_debug.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_debug.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_dev.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_device.h#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_generic.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hid.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_hub.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_process.c#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_request.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_revision.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.c#7 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usb_transfer.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/usbdevs#15 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rum.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_rumvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uath.c#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uathvar.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_upgt.c#2 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_ural.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_uralvar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/usb/wlan/if_zyd.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/vge/if_vge.c#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/wi/if_wavelan_ieee.h#3 integrate .. //depot/projects/vimage-commit/src/sys/dev/wi/if_wi.c#6 integrate .. //depot/projects/vimage-commit/src/sys/dev/wi/if_wireg.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/wi/if_wivar.h#5 integrate .. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpi.c#11 integrate .. //depot/projects/vimage-commit/src/sys/dev/wpi/if_wpivar.h#4 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/console/console.c#8 integrate .. //depot/projects/vimage-commit/src/sys/dev/xen/netfront/netfront.c#6 integrate .. //depot/projects/vimage-commit/src/sys/fs/devfs/devfs_vnops.c#11 integrate .. //depot/projects/vimage-commit/src/sys/fs/fdescfs/fdesc_vnops.c#5 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_commonkrpc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfs_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsdport.h#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsport.h#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfs/nfsproto.h#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs.h#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clbio.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clkrpc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clnode.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clport.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clrpcops.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clstate.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvfsops.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsclient/nfs_clvnops.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdkrpc.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdport.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdserv.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdsocket.c#3 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdstate.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nfsserver/nfs_nfsdsubs.c#2 integrate .. //depot/projects/vimage-commit/src/sys/fs/nwfs/nwfs_io.c#4 integrate .. //depot/projects/vimage-commit/src/sys/fs/smbfs/smbfs_io.c#5 integrate .. //depot/projects/vimage-commit/src/sys/geom/concat/g_concat.c#4 integrate .. //depot/projects/vimage-commit/src/sys/gnu/fs/xfs/FreeBSD/support/debug.h#3 integrate .. //depot/projects/vimage-commit/src/sys/gnu/fs/xfs/FreeBSD/xfsdmapistubs.c#3 delete .. //depot/projects/vimage-commit/src/sys/gnu/fs/xfs/FreeBSD/xfsquotasstubs.c#3 delete .. //depot/projects/vimage-commit/src/sys/gnu/fs/xfs/FreeBSD/xfsrtstubs.c#3 delete .. //depot/projects/vimage-commit/src/sys/i386/acpica/acpi_machdep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/bios/smapi.c#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/conf/GENERIC.hints#4 integrate .. //depot/projects/vimage-commit/src/sys/i386/cpufreq/hwpstate.c#2 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/machdep.c#10 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/mca.c#1 branch .. //depot/projects/vimage-commit/src/sys/i386/i386/mp_machdep.c#11 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/vimage-commit/src/sys/i386/i386/trap.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/mca.h#1 branch .. //depot/projects/vimage-commit/src/sys/i386/include/param.h#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/smp.h#5 integrate .. //depot/projects/vimage-commit/src/sys/i386/include/specialreg.h#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/linux/linux.h#6 integrate .. //depot/projects/vimage-commit/src/sys/i386/pci/pci_cfgreg.c#7 integrate .. //depot/projects/vimage-commit/src/sys/i386/xen/mp_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/elf_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/ia64/ia64/pmap.c#4 integrate .. //depot/projects/vimage-commit/src/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_clock.c#6 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_conf.c#12 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_descrip.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_intr.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_jail.c#15 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_lock.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_mutex.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_poll.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_sysctl.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/kern_vimage.c#18 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_acl_posix1e.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_bus.c#7 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_rman.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/subr_witness.c#8 integrate .. //depot/projects/vimage-commit/src/sys/kern/sys_generic.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty.c#14 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_info.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/tty_inq.c#4 integrate .. //depot/projects/vimage-commit/src/sys/kern/uipc_syscalls.c#9 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_acl.c#5 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_bio.c#11 integrate .. //depot/projects/vimage-commit/src/sys/kern/vfs_syscalls.c#8 integrate .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_upgt.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/if_upgtvar.h#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_ethersubr.c#2 delete .. //depot/projects/vimage-commit/src/sys/legacy/dev/usb/usb_ethersubr.h#2 delete .. //depot/projects/vimage-commit/src/sys/mips/mips/machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/mips/mips/pm_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/mips/mips/pmap.c#8 integrate .. //depot/projects/vimage-commit/src/sys/modules/nfs4client/Makefile#3 delete .. //depot/projects/vimage-commit/src/sys/modules/nfsclient/Makefile#6 integrate .. //depot/projects/vimage-commit/src/sys/modules/wlan/Makefile#5 integrate .. //depot/projects/vimage-commit/src/sys/modules/xfs/Makefile#3 integrate .. //depot/projects/vimage-commit/src/sys/net/bpf.c#11 integrate .. //depot/projects/vimage-commit/src/sys/net/if.c#24 integrate .. //depot/projects/vimage-commit/src/sys/net/if_clone.c#8 integrate .. //depot/projects/vimage-commit/src/sys/net/if_llatbl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net/if_llatbl.h#3 integrate .. //depot/projects/vimage-commit/src/sys/net/if_loop.c#19 integrate .. //depot/projects/vimage-commit/src/sys/net/if_var.h#16 integrate .. //depot/projects/vimage-commit/src/sys/net/netisr.c#7 integrate .. //depot/projects/vimage-commit/src/sys/net/netisr.h#5 integrate .. //depot/projects/vimage-commit/src/sys/net/vnet.h#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.c#12 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211.h#8 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_adhoc.c#8 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ddb.c#13 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.c#11 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_freebsd.h#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_hostap.c#8 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_ht.c#7 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_input.c#7 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_monitor.c#3 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_node.h#7 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_output.c#12 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_proto.c#8 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_proto.h#7 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_radiotap.c#1 branch .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan.c#7 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan.h#6 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_scan_sta.c#7 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_sta.c#9 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_superg.c#5 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_tdma.c#4 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_tdma.h#3 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_var.h#13 integrate .. //depot/projects/vimage-commit/src/sys/net80211/ieee80211_wds.c#8 integrate .. //depot/projects/vimage-commit/src/sys/netgraph/netflow/ng_netflow.c#4 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet/in_pcb.h#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_fw2.c#18 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_ipsec.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet/ip_output.c#16 integrate .. //depot/projects/vimage-commit/src/sys/netinet/tcp_subr.c#21 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_usrreq.c#17 integrate .. //depot/projects/vimage-commit/src/sys/netinet/udp_var.h#6 integrate .. //depot/projects/vimage-commit/src/sys/netinet/vinet.h#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/in6.c#13 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_ipsec.c#11 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/mld6.c#15 integrate .. //depot/projects/vimage-commit/src/sys/netinet6/udp6_usrreq.c#14 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.c#19 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec.h#10 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/ipsec6.h#6 integrate .. //depot/projects/vimage-commit/src/sys/netipsec/vipsec.h#7 integrate .. //depot/projects/vimage-commit/src/sys/netnatm/natm.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nfs/nfs_common.c#3 integrate .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4.h#3 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_dev.c#4 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_dev.h#3 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_idmap.c#4 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_idmap.h#3 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_socket.c#6 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_subs.c#4 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_vfs.h#3 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_vfs_subs.c#3 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_vfsops.c#6 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_vn.h#3 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_vn_subs.c#4 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4_vnops.c#6 delete .. //depot/projects/vimage-commit/src/sys/nfs4client/nfs4m_subs.h#3 delete .. //depot/projects/vimage-commit/src/sys/nfsclient/bootp_subr.c#7 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/krpc_subr.c#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs.h#8 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_bio.c#6 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_diskless.c#9 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_krpc.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_lock.c#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_nfsiod.c#4 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_node.c#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_socket.c#10 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_subs.c#6 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vfsops.c#14 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfs_vnops.c#13 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfsm_subs.h#3 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfsmount.h#5 integrate .. //depot/projects/vimage-commit/src/sys/nfsclient/nfsnode.h#6 integrate .. //depot/projects/vimage-commit/src/sys/nlm/nlm.h#5 integrate .. //depot/projects/vimage-commit/src/sys/nlm/nlm_advlock.c#8 integrate .. //depot/projects/vimage-commit/src/sys/nlm/nlm_prot_impl.c#9 integrate .. //depot/projects/vimage-commit/src/sys/opencrypto/cryptodev.c#4 integrate .. //depot/projects/vimage-commit/src/sys/pc98/include/mca.h#1 branch .. //depot/projects/vimage-commit/src/sys/pc98/pc98/machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/clock.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/machdep.c#9 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/mmu_oea.c#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/mmu_oea64.c#2 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/mp_cpudep.c#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/ofw_machdep.c#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/aim/platform_chrp.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/aim/vm_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/clock.c#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/locore.S#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/mp_cpudep.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/booke/platform_bare.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/booke/pmap.c#8 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/trap_subr.S#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/booke/vm_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/cpufunc.h#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/md_var.h#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/mutex.h#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/ofw_machdep.h#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/pcpu.h#5 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/platform.h#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/include/platformvar.h#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/include/pmap.h#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/powerpc.h#3 delete .. //depot/projects/vimage-commit/src/sys/powerpc/include/smp.h#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/include/spr.h#7 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/mpc85xx/ocpbus.c#6 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/mpc85xx/ocpbus.h#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/busdma_machdep.c#3 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/genassym.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/mp_machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/openpic.c#4 integrate .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/platform.c#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/platform_if.m#1 branch .. //depot/projects/vimage-commit/src/sys/powerpc/powerpc/pmap_dispatch.c#5 integrate .. //depot/projects/vimage-commit/src/sys/rpc/rpcclnt.c#6 delete .. //depot/projects/vimage-commit/src/sys/rpc/rpcclnt.h#3 delete .. //depot/projects/vimage-commit/src/sys/sparc64/conf/GENERIC#10 integrate .. //depot/projects/vimage-commit/src/sys/sparc64/sparc64/machdep.c#7 integrate .. //depot/projects/vimage-commit/src/sys/sun4v/sun4v/machdep.c#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/acl.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/buf.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/eventhandler.h#4 integrate .. //depot/projects/vimage-commit/src/sys/sys/filedesc.h#3 integrate .. //depot/projects/vimage-commit/src/sys/sys/interrupt.h#5 integrate .. //depot/projects/vimage-commit/src/sys/sys/param.h#22 integrate .. //depot/projects/vimage-commit/src/sys/sys/priv.h#8 integrate .. //depot/projects/vimage-commit/src/sys/sys/proc.h#12 integrate .. //depot/projects/vimage-commit/src/sys/sys/systm.h#8 integrate .. //depot/projects/vimage-commit/src/sys/sys/vimage.h#27 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ffs/ffs_alloc.c#4 integrate .. //depot/projects/vimage-commit/src/sys/ufs/ufs/ufs_acl.c#4 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_contig.c#3 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_page.c#7 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_page.h#5 integrate .. //depot/projects/vimage-commit/src/sys/vm/vm_pageout.c#7 integrate .. //depot/projects/vimage-commit/src/sys/vm/vnode_pager.c#9 integrate Differences ... ==== //depot/projects/vimage-commit/src/sys/Makefile#7 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.54 2009/02/15 18:19:24 imp Exp $ +# $FreeBSD: src/sys/Makefile,v 1.55 2009/05/22 12:35:12 rwatson Exp $ .include <bsd.own.mk> @@ -11,7 +11,7 @@ CSCOPEDIRS= boot bsm cam cddl compat conf contrib crypto ddb dev fs gdb \ geom gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ - netsmb nfs nfs4client nfsclient nfsserver nlm opencrypto \ + netsmb nfs nfsclient nfsserver nlm opencrypto \ pci rpc security sys ufs vm xdr ${CSCOPE_ARCHDIR} .if defined(ALL_ARCH) CSCOPE_ARCHDIR ?= amd64 arm i386 ia64 mips pc98 powerpc sparc64 sun4v ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/machdep.c#9 (text+ko) ==== @@ -39,7 +39,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.699 2009/04/11 14:01:01 ed Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.701 2009/05/18 18:37:18 marcel Exp $"); #include "opt_atalk.h" #include "opt_atpic.h" @@ -109,6 +109,7 @@ #include <machine/cpu.h> #include <machine/cputypes.h> #include <machine/intr_machdep.h> +#include <machine/mca.h> #include <machine/md_var.h> #include <machine/metadata.h> #include <machine/pc/bios.h> @@ -274,6 +275,7 @@ vm_pager_bufferinit(); cpu_setregs(); + mca_init(); } /* @@ -504,6 +506,16 @@ { } +/* + * Flush the D-cache for non-DMA I/O so that the I-cache can + * be made coherent later. + */ +void +cpu_flush_dcache(void *ptr, size_t len) +{ + /* Not applicable */ +} + /* Get current clock frequency for the given cpu id. */ int cpu_est_clockrate(int cpu_id, uint64_t *rate) ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/mp_machdep.c#12 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.306 2009/05/02 12:20:43 mav Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.308 2009/05/14 17:43:00 attilio Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -60,6 +60,7 @@ #include <machine/clock.h> #include <machine/cputypes.h> #include <machine/cpufunc.h> +#include <machine/mca.h> #include <machine/md_var.h> #include <machine/mp_watchdog.h> #include <machine/pcb.h> @@ -113,9 +114,9 @@ extern inthand_t IDTVEC(fast_syscall), IDTVEC(fast_syscall32); #ifdef STOP_NMI -volatile cpumask_t ipi_nmi_pending; +static volatile cpumask_t ipi_nmi_pending; -static void ipi_nmi_selected(u_int32_t cpus); +static void ipi_nmi_selected(cpumask_t cpus); #endif /* @@ -667,6 +668,8 @@ KASSERT(PCPU_GET(idlethread) != NULL, ("no idle thread")); PCPU_SET(curthread, PCPU_GET(idlethread)); + mca_init(); + mtx_lock_spin(&ap_boot_mtx); /* Init local apic for irq's */ @@ -1013,7 +1016,7 @@ } static void -smp_targeted_tlb_shootdown(u_int mask, u_int vector, vm_offset_t addr1, vm_offset_t addr2) +smp_targeted_tlb_shootdown(cpumask_t mask, u_int vector, vm_offset_t addr1, vm_offset_t addr2) { int ncpu, othercpus; @@ -1087,7 +1090,7 @@ } void -smp_masked_invltlb(u_int mask) +smp_masked_invltlb(cpumask_t mask) { if (smp_started) { @@ -1096,7 +1099,7 @@ } void -smp_masked_invlpg(u_int mask, vm_offset_t addr) +smp_masked_invlpg(cpumask_t mask, vm_offset_t addr) { if (smp_started) { @@ -1105,7 +1108,7 @@ } void -smp_masked_invlpg_range(u_int mask, vm_offset_t addr1, vm_offset_t addr2) +smp_masked_invlpg_range(cpumask_t mask, vm_offset_t addr1, vm_offset_t addr2) { if (smp_started) { @@ -1140,7 +1143,7 @@ * send an IPI to a set of cpus. */ void -ipi_selected(u_int32_t cpus, u_int ipi) +ipi_selected(cpumask_t cpus, u_int ipi) { int cpu; u_int bitmap = 0; @@ -1203,8 +1206,8 @@ #define BEFORE_SPIN 1000000 -void -ipi_nmi_selected(u_int32_t cpus) +static void +ipi_nmi_selected(cpumask_t cpus) { int cpu; register_t icrlo; @@ -1328,7 +1331,7 @@ static int sysctl_hlt_cpus(SYSCTL_HANDLER_ARGS) { - u_int mask; + cpumask_t mask; int error; mask = hlt_cpus_mask; ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/pmap.c#11 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.657 2009/03/22 04:32:05 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.658 2009/05/13 07:42:53 alc Exp $"); /* * Manages physical address maps. @@ -3556,7 +3556,7 @@ dstmpte->wire_count++; else if ((dstmpte = pmap_allocpte(dst_pmap, addr, M_NOWAIT)) == NULL) - break; + goto out; dst_pte = (pt_entry_t *) PHYS_TO_DMAP(VM_PAGE_TO_PHYS(dstmpte)); dst_pte = &dst_pte[pmap_pte_index(addr)]; @@ -3579,6 +3579,7 @@ addr); pmap_free_zero_pages(free); } + goto out; } if (dstmpte->wire_count >= srcmpte->wire_count) break; @@ -3587,6 +3588,7 @@ src_pte++; } } +out: vm_page_unlock_queues(); PMAP_UNLOCK(src_pmap); PMAP_UNLOCK(dst_pmap); ==== //depot/projects/vimage-commit/src/sys/amd64/amd64/trap.c#7 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.331 2009/04/01 13:09:26 kib Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.332 2009/05/13 17:53:04 jhb Exp $"); /* * AMD64 Trap and System call handling @@ -88,6 +88,7 @@ #include <machine/cpu.h> #include <machine/intr_machdep.h> +#include <machine/mca.h> #include <machine/md_var.h> #include <machine/pcb.h> #ifdef SMP @@ -266,6 +267,12 @@ goto out; #endif + if (type == T_MCHK) { + if (!mca_intr()) + trap_fatal(frame, 0); + goto out; + } + #ifdef KDTRACE_HOOKS /* * A trap can occur while DTrace executes a probe. Before ==== //depot/projects/vimage-commit/src/sys/amd64/conf/GENERIC.hints#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.19 2008/07/13 07:20:14 ed Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC.hints,v 1.20 2009/05/14 21:53:35 jhb Exp $ hint.fdc.0.at="isa" hint.fdc.0.port="0x3F0" hint.fdc.0.irq="6" @@ -13,7 +13,6 @@ hint.atkbd.0.irq="1" hint.psm.0.at="atkbdc" hint.psm.0.irq="12" -hint.vga.0.at="isa" hint.sc.0.at="isa" hint.sc.0.flags="0x100" hint.uart.0.at="isa" @@ -23,13 +22,5 @@ hint.uart.1.at="isa" hint.uart.1.port="0x2F8" hint.uart.1.irq="3" -hint.uart.2.at="isa" -hint.uart.2.disabled="1" -hint.uart.2.port="0x3E8" -hint.uart.2.irq="5" -hint.uart.3.at="isa" -hint.uart.3.disabled="1" -hint.uart.3.port="0x2E8" -hint.uart.3.irq="9" hint.ppc.0.at="isa" hint.ppc.0.irq="7" ==== //depot/projects/vimage-commit/src/sys/amd64/include/param.h#7 (text+ko) ==== @@ -36,7 +36,7 @@ * SUCH DAMAGE. * * @(#)param.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/amd64/include/param.h,v 1.27 2009/04/20 12:59:23 rwatson Exp $ + * $FreeBSD: src/sys/amd64/include/param.h,v 1.28 2009/05/18 19:33:59 jhb Exp $ */ /* @@ -93,7 +93,7 @@ * CACHE_LINE_SIZE is the compile-time maximum cache line size for an * architecture. It should be used with appropriate caution. */ -#define CACHE_LINE_SHIFT 6 +#define CACHE_LINE_SHIFT 7 #define CACHE_LINE_SIZE (1 << CACHE_LINE_SHIFT) /* Size of the level 1 page table units */ ==== //depot/projects/vimage-commit/src/sys/amd64/include/smp.h#6 (text+ko) ==== @@ -6,7 +6,7 @@ * this stuff is worth it, you can buy me a beer in return. Poul-Henning Kamp * ---------------------------------------------------------------------------- * - * $FreeBSD: src/sys/amd64/include/smp.h,v 1.95 2009/04/29 06:54:40 jeff Exp $ + * $FreeBSD: src/sys/amd64/include/smp.h,v 1.96 2009/05/14 17:43:00 attilio Exp $ * */ @@ -52,19 +52,19 @@ void cpustop_handler(void); void cpususpend_handler(void); void init_secondary(void); -void ipi_selected(u_int cpus, u_int ipi); +void ipi_selected(cpumask_t cpus, u_int ipi); void ipi_all_but_self(u_int ipi); void ipi_bitmap_handler(struct trapframe frame); u_int mp_bootaddress(u_int); int mp_grab_cpu_hlt(void); void smp_cache_flush(void); void smp_invlpg(vm_offset_t addr); -void smp_masked_invlpg(u_int mask, vm_offset_t addr); +void smp_masked_invlpg(cpumask_t mask, vm_offset_t addr); void smp_invlpg_range(vm_offset_t startva, vm_offset_t endva); -void smp_masked_invlpg_range(u_int mask, vm_offset_t startva, +void smp_masked_invlpg_range(cpumask_t mask, vm_offset_t startva, vm_offset_t endva); void smp_invltlb(void); -void smp_masked_invltlb(u_int mask); +void smp_masked_invltlb(cpumask_t mask); #ifdef STOP_NMI int ipi_nmi_handler(void); ==== //depot/projects/vimage-commit/src/sys/amd64/include/specialreg.h#7 (text+ko) ==== @@ -27,7 +27,7 @@ * SUCH DAMAGE. * * from: @(#)specialreg.h 7.1 (Berkeley) 5/9/91 - * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.54 2009/04/29 06:54:40 jeff Exp $ + * $FreeBSD: src/sys/amd64/include/specialreg.h,v 1.55 2009/05/13 17:53:04 jhb Exp $ */ #ifndef _MACHINE_SPECIALREG_H_ @@ -346,6 +346,34 @@ #define DIR1 0xff /* + * Machine Check register constants. + */ +#define MCG_CAP_COUNT 0x000000ff +#define MCG_CAP_CTL_P 0x00000100 +#define MCG_CAP_EXT_P 0x00000200 +#define MCG_CAP_TES_P 0x00000800 +#define MCG_CAP_EXT_CNT 0x00ff0000 +#define MCG_STATUS_RIPV 0x00000001 +#define MCG_STATUS_EIPV 0x00000002 +#define MCG_STATUS_MCIP 0x00000004 +#define MCG_CTL_ENABLE 0xffffffffffffffffUL +#define MCG_CTL_DISABLE 0x0000000000000000UL +#define MSR_MC_CTL(x) (MSR_MC0_CTL + (x) * 4) +#define MSR_MC_STATUS(x) (MSR_MC0_STATUS + (x) * 4) +#define MSR_MC_ADDR(x) (MSR_MC0_ADDR + (x) * 4) +#define MSR_MC_MISC(x) (MSR_MC0_MISC + (x) * 4) +#define MC_STATUS_MCA_ERROR 0x000000000000ffffUL +#define MC_STATUS_MODEL_ERROR 0x00000000ffff0000UL +#define MC_STATUS_OTHER_INFO 0x01ffffff00000000UL +#define MC_STATUS_PCC 0x0200000000000000UL +#define MC_STATUS_ADDRV 0x0400000000000000UL +#define MC_STATUS_MISCV 0x0800000000000000UL +#define MC_STATUS_EN 0x1000000000000000UL +#define MC_STATUS_UC 0x2000000000000000UL +#define MC_STATUS_OVER 0x4000000000000000UL +#define MC_STATUS_VAL 0x8000000000000000UL + +/* * The following four 3-byte registers control the non-cacheable regions. * These registers must be written as three separate bytes. * ==== //depot/projects/vimage-commit/src/sys/amd64/include/vmparam.h#5 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * from: @(#)vmparam.h 5.9 (Berkeley) 5/12/91 - * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.56 2008/07/08 22:59:17 alc Exp $ + * $FreeBSD: src/sys/amd64/include/vmparam.h,v 1.59 2009/05/16 22:08:00 kmacy Exp $ */ @@ -154,8 +154,7 @@ * 0xffff800000000000 - 0xffff804020100fff recursive page table (512GB slot) * 0xffff804020101000 - 0xfffffeffffffffff unused * 0xffffff0000000000 - 0xffffff7fffffffff 512GB direct map mappings - * 0xffffff8000000000 - 0xfffffffe3fffffff unused (505GB) - * 0xfffffffe40000000 - 0xffffffffffffffff 7GB kernel map + * 0xffffff8000000000 - 0xffffffffffffffff 512GB kernel map * * Within the kernel map: * @@ -163,7 +162,7 @@ */ #define VM_MAX_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-1, NPDEPG-1, NPTEPG-1) -#define VM_MIN_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-7, 0, 0) +#define VM_MIN_KERNEL_ADDRESS KVADDR(KPML4I, NPDPEPG-512, 0, 0) #define DMAP_MIN_ADDRESS KVADDR(DMPML4I, 0, 0, 0) #define DMAP_MAX_ADDRESS KVADDR(DMPML4I+1, 0, 0, 0) ==== //depot/projects/vimage-commit/src/sys/amd64/linux32/linux.h#8 (text+ko) ==== @@ -27,7 +27,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/linux32/linux.h,v 1.27 2009/05/11 13:50:42 dchagin Exp $ + * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.28 2009/05/16 18:48:41 dchagin Exp $ */ #ifndef _AMD64_LINUX_H_ @@ -571,6 +571,7 @@ #define LINUX_O_DIRECTORY 00200000 /* Must be a directory */ #define LINUX_O_NOFOLLOW 00400000 /* Do not follow links */ #define LINUX_O_NOATIME 01000000 +#define LINUX_O_CLOEXEC 02000000 #define LINUX_F_DUPFD 0 #define LINUX_F_GETFD 1 ==== //depot/projects/vimage-commit/src/sys/amd64/pci/pci_cfgreg.c#6 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.114 2009/03/24 18:10:22 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/pci/pci_cfgreg.c,v 1.115 2009/05/18 21:47:32 jhb Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -35,6 +35,7 @@ #include <sys/lock.h> #include <sys/kernel.h> #include <sys/mutex.h> +#include <sys/sysctl.h> #include <dev/pci/pcivar.h> #include <dev/pci/pcireg.h> #include <vm/vm.h> @@ -56,6 +57,8 @@ 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); +SYSCTL_DECL(_hw_pci); + static int cfgmech; static vm_offset_t pcie_base; static int pcie_minbus, pcie_maxbus; @@ -63,6 +66,8 @@ static struct mtx pcicfg_mtx; static int mcfg_enable = 1; TUNABLE_INT("hw.pci.mcfg", &mcfg_enable); +SYSCTL_INT(_hw_pci, OID_AUTO, mcfg, CTLFLAG_RDTUN, &mcfg_enable, 0, + "Enable support for PCI-e memory mapped config access"); /* * Initialise access to PCI configuration space ==== //depot/projects/vimage-commit/src/sys/arm/arm/machdep.c#4 (text+ko) ==== @@ -46,7 +46,7 @@ #include "opt_ddb.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.32 2009/02/12 22:55:39 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/machdep.c,v 1.33 2009/05/18 18:37:18 marcel Exp $"); #include <sys/param.h> #include <sys/proc.h> @@ -316,6 +316,18 @@ SYSINIT(cpu, SI_SUB_CPU, SI_ORDER_FIRST, cpu_startup, NULL); +/* + * Flush the D-cache for non-DMA I/O so that the I-cache can + * be made coherent later. + */ +void +cpu_flush_dcache(void *ptr, size_t len) +{ + + cpu_dcache_wb_range((uintptr_t)ptr, len); + cpu_l2cache_wb_range((uintptr_t)ptr, len); +} + /* Get current clock frequency for the given cpu id. */ int cpu_est_clockrate(int cpu_id, uint64_t *rate) ==== //depot/projects/vimage-commit/src/sys/arm/at91/at91.c#7 (text) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.23 2009/04/22 23:54:41 stas Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.24 2009/05/15 04:49:20 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -409,7 +409,7 @@ AT91RM92_IRQ_SSC2 }, { - "at91_spi", 0, + "spi", 0, AT91RM92_BASE + AT91RM92_SPI_BASE, AT91RM92_SPI_SIZE, AT91RM92_IRQ_SPI }, ==== //depot/projects/vimage-commit/src/sys/arm/at91/at91_spi.c#4 (text) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.8 2008/11/25 00:13:26 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.9 2009/05/13 18:42:49 gonzo Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -297,7 +297,7 @@ }; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200905232215.n4NMFwdI019072>