Date: Wed, 4 Mar 2009 12:48:33 GMT From: Marko Zec <zec@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 158667 for review Message-ID: <200903041248.n24CmXQU096348@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=158667 Change 158667 by zec@zec_amdx2 on 2009/03/04 12:48:29 IFC @ 158633 Affected files ... .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#5 integrate .. //depot/projects/vimage-commit2/src/sys/amd64/conf/USB2#2 delete .. //depot/projects/vimage-commit2/src/sys/arm/at91/files.at91#3 integrate .. //depot/projects/vimage-commit2/src/sys/arm/mv/files.mv#4 integrate .. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.ixp425#3 integrate .. //depot/projects/vimage-commit2/src/sys/boot/i386/btx/btx/btx.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/sysmacros.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#19 integrate .. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_ntoskrnl.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/conf/NOTES#16 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files#23 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.i386#13 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.ia64#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.mips#6 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.pc98#9 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.powerpc#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sparc64#8 integrate .. //depot/projects/vimage-commit2/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kern.mk#5 integrate .. //depot/projects/vimage-commit2/src/sys/conf/kern.pre.mk#6 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-disk.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-queue.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-raid.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-usb.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-cam.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-cd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-tape.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-jmicron.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-promise.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_internal.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5210/ar5210_misc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5211/ar5211_misc.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar2425.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_gpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_reset.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5413.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5312_gpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5312/ar5315_gpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar2133.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416.ini#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_gpio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_interrupts.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416reg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9160.ini#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar9160_attach.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcefw.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_bufs.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_irq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_lock.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_dma.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_irq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_reg.h#1 branch .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_drv.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mach64_irq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_dma.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/mga_irq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_drv.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/r128_irq.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_irq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ichwd/ichwd.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/mca/mca_bus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/nsp/nsp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/ofw/ofw_iicbus.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccard.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccardvar.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci.c#8 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pci_private.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/pci/pcireg.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/dev/stg/tmc18c30.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/syscons/scterm-teken.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/3c990img.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/if_txp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/txp/if_txpreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ng_ubt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/bluetooth/ubtbcmfw.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ehci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/ohci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uhci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci_atmelarm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/image/uscanner.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/uhid.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ukbd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/ums.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/input/usb_rdesc.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/udbp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/misc/ufm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_aue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_rue.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udav.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/quirk/usb_quirk.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/u3g.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uark.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubsa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ubser.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uchcom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ucycom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ufoma.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uftdi.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ugensa.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uipaq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/ulpt.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umct.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umodem.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/umoscom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uplcom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uslcom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvisor.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/uvscom.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/urio.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_cdce.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_msc.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/template/usb_template_mtp.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_bus.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_compat_linux.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_core.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_dev.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_generic.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hid.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_hub.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_ioctl.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_request.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#18 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rum.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_rumvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_ural.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_uralvar.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zydreg.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/denode.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_denode.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfs_vnops.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/fs/msdosfs/msdosfsmount.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_dbregs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_fpregs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_regs.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/fs/udf/udf_vnops.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_compat.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#13 integrate .. //depot/projects/vimage-commit2/src/sys/i386/conf/USB2#2 delete .. //depot/projects/vimage-commit2/src/sys/i386/i386/mp_machdep.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/i386/i386/vm86.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/i386/isa/npx.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_condvar.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_cons.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_malloc.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_priv.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_rwlock.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_thr.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_time.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_prf.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_smp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/subr_witness.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sys_process.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/sysv_shm.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_info.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_inq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_outq.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_pty.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/kern/tty_ttydisc.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/legacy/dev/usb/usbdevs#2 delete .. //depot/projects/vimage-commit2/src/sys/libkern/memmove.c#1 branch .. //depot/projects/vimage-commit2/src/sys/libkern/strtouq.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/mips/mips/pmap.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/net/bpf.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_var.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net/vnet.h#13 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_ccatm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/atm/uni/ng_uni_cust.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_l2tp.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_pppoe.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netgraph/ng_pppoe.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#16 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_proto.c#11 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#24 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip6.h#7 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#19 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw2.c#35 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#27 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_crc32.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_input.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#22 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_output.h#5 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/sctp_usrreq.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#18 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#15 integrate .. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#26 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#25 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#21 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#12 integrate .. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#22 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#23 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/key_debug.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#20 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#19 integrate .. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#13 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#9 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#10 integrate .. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#14 integrate .. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_syscalls.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/pci/viapm.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/machdep.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#6 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/swtch.S#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/trap.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/booke/trap_subr.S#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/frame.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/include/pcb.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/genassym.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_errno.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm_token.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_framework.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/security/mac/mac_process.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/sys/cdefs.h#4 integrate .. //depot/projects/vimage-commit2/src/sys/sys/fcntl.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/mount.h#9 integrate .. //depot/projects/vimage-commit2/src/sys/sys/param.h#27 integrate .. //depot/projects/vimage-commit2/src/sys/sys/priv.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/sdt.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/shm.h#2 integrate .. //depot/projects/vimage-commit2/src/sys/sys/systm.h#6 integrate .. //depot/projects/vimage-commit2/src/sys/sys/tree.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#28 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_fault.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_kern.c#5 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_map.c#4 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_map.h#3 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#7 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_pager.c#2 integrate .. //depot/projects/vimage-commit2/src/sys/vm/vm_unix.c#3 integrate .. //depot/projects/vimage-commit2/src/sys/xdr/xdr_mem.c#2 integrate Differences ... ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.297 2009/02/03 09:01:45 jkoshy Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.299 2009/02/25 22:24:56 sobomax Exp $"); #include "opt_cpu.h" #include "opt_kstack_pages.h" @@ -151,6 +151,7 @@ int cpu_present:1; int cpu_bsp:1; int cpu_disabled:1; + int cpu_hyperthread:1; } static cpu_info[MAX_APIC_ID + 1]; int cpu_apic_ids[MAXCPU]; int apic_cpuids[MAX_APIC_ID + 1]; @@ -353,11 +354,6 @@ cpu_apic_ids[0] = boot_cpu_id; apic_cpuids[boot_cpu_id] = 0; - assign_cpu_ids(); - - /* Start each Application Processor */ - start_all_aps(); - /* Setup the initial logical CPUs info. */ logical_cpus = logical_cpus_mask = 0; if (cpu_feature & CPUID_HTT) @@ -404,6 +400,11 @@ hyperthreading_cpus = logical_cpus; } + assign_cpu_ids(); + + /* Start each Application Processor */ + start_all_aps(); + set_interrupt_apic_ids(); } @@ -415,18 +416,26 @@ cpu_mp_announce(void) { int i, x; + const char *hyperthread; /* List CPUs */ printf(" cpu0 (BSP): APIC ID: %2d\n", boot_cpu_id); for (i = 1, x = 0; x <= MAX_APIC_ID; x++) { if (!cpu_info[x].cpu_present || cpu_info[x].cpu_bsp) continue; + if (cpu_info[x].cpu_hyperthread) { + hyperthread = "/HT"; + } else { + hyperthread = ""; + } if (cpu_info[x].cpu_disabled) - printf(" cpu (AP): APIC ID: %2d (disabled)\n", x); + printf(" cpu (AP%s): APIC ID: %2d (disabled)\n", + hyperthread, x); else { KASSERT(i < mp_ncpus, ("mp_ncpus and actual cpus are out of whack")); - printf(" cpu%d (AP): APIC ID: %2d\n", i++, x); + printf(" cpu%d (AP%s): APIC ID: %2d\n", i++, + hyperthread, x); } } } @@ -642,11 +651,28 @@ { u_int i; + TUNABLE_INT_FETCH("machdep.hyperthreading_allowed", + &hyperthreading_allowed); + /* Check for explicitly disabled CPUs. */ for (i = 0; i <= MAX_APIC_ID; i++) { if (!cpu_info[i].cpu_present || cpu_info[i].cpu_bsp) continue; + if (hyperthreading_cpus > 1 && i % hyperthreading_cpus != 0) { + cpu_info[i].cpu_hyperthread = 1; +#if defined(SCHED_ULE) + /* + * Don't use HT CPU if it has been disabled by a + * tunable. + */ + if (hyperthreading_allowed == 0) { + cpu_info[i].cpu_disabled = 1; + continue; + } +#endif + } + /* Don't use this CPU if it has been disabled by a tunable. */ if (resource_disabled("lapic", i)) { cpu_info[i].cpu_disabled = 1; @@ -1198,6 +1224,16 @@ if (error || !req->newptr) return (error); +#ifdef SCHED_ULE + /* + * SCHED_ULE doesn't allow enabling/disabling HT cores at + * run time. + */ + if (allowed != hyperthreading_allowed) + return (ENOTSUP); + return (error); +#endif + if (allowed) hlt_cpus_mask &= ~hyperthreading_cpus_mask; else @@ -1242,8 +1278,6 @@ * of hlt_logical_cpus. */ if (hyperthreading_cpus_mask) { - TUNABLE_INT_FETCH("machdep.hyperthreading_allowed", - &hyperthreading_allowed); SYSCTL_ADD_PROC(&logical_cpu_clist, SYSCTL_STATIC_CHILDREN(_machdep), OID_AUTO, "hyperthreading_allowed", CTLTYPE_INT|CTLFLAG_RW, ==== //depot/projects/vimage-commit2/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.648 2009/02/23 06:00:24 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.649 2009/02/25 20:26:48 jkim Exp $"); /* * Manages physical address maps. @@ -594,7 +594,6 @@ if (!(cpu_feature & CPUID_PAT)) panic("no PAT??"); -#ifdef PAT_WORKS /* * Leave the indices 0-3 at the default of WB, WT, UC, and UC-. * Program 4 and 5 as WP and WC. @@ -604,23 +603,6 @@ pat_msr &= ~(PAT_MASK(4) | PAT_MASK(5)); pat_msr |= PAT_VALUE(4, PAT_WRITE_PROTECTED) | PAT_VALUE(5, PAT_WRITE_COMBINING); -#else - /* - * Due to some Intel errata, we can only safely use the lower 4 - * PAT entries. Thus, just replace PAT Index 2 with WC instead - * of UC-. - * - * Intel Pentium III Processor Specification Update - * Errata E.27 (Upper Four PAT Entries Not Usable With Mode B - * or Mode C Paging) - * - * Intel Pentium IV Processor Specification Update - * Errata N46 (PAT Index MSB May Be Calculated Incorrectly) - */ - pat_msr = rdmsr(MSR_PAT); - pat_msr &= ~PAT_MASK(2); - pat_msr |= PAT_VALUE(2, PAT_WRITE_COMBINING); -#endif wrmsr(MSR_PAT, pat_msr); } @@ -783,10 +765,9 @@ break; } } - + /* Map the caching mode to a PAT index. */ switch (mode) { -#ifdef PAT_WORKS case PAT_UNCACHEABLE: pat_index = 3; break; @@ -805,25 +786,9 @@ case PAT_WRITE_PROTECTED: pat_index = 4; break; -#else - case PAT_UNCACHED: - case PAT_UNCACHEABLE: - case PAT_WRITE_PROTECTED: - pat_index = 3; - break; - case PAT_WRITE_THROUGH: - pat_index = 1; - break; - case PAT_WRITE_BACK: - pat_index = 0; - break; - case PAT_WRITE_COMBINING: - pat_index = 2; - break; -#endif default: panic("Unknown caching mode %d\n", mode); - } + } /* Map the 3-bit index value into the PAT, PCD, and PWT bits. */ cache_bits = 0; ==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#4 (text+ko) ==== @@ -41,7 +41,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.259 2008/10/05 02:03:54 davidxu Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/vm_machdep.c,v 1.260 2009/03/02 18:43:50 kib Exp $"); #include "opt_isa.h" #include "opt_cpu.h" @@ -62,6 +62,7 @@ #include <sys/sf_buf.h> #include <sys/smp.h> #include <sys/sysctl.h> +#include <sys/sysent.h> #include <sys/unistd.h> #include <sys/vnode.h> #include <sys/vmmeter.h> @@ -80,12 +81,6 @@ #include <amd64/isa/isa.h> -#ifdef COMPAT_IA32 - -extern struct sysentvec ia32_freebsd_sysvec; - -#endif - static void cpu_reset_real(void); #ifdef SMP static void cpu_reset_proxy(void); @@ -331,7 +326,7 @@ cpu_thread_clean(td); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { /* * Set the trap frame to point at the beginning of the uts * function. @@ -377,7 +372,7 @@ return (EINVAL); #ifdef COMPAT_IA32 - if (td->td_proc->p_sysent == &ia32_freebsd_sysvec) { + if (td->td_proc->p_sysent->sv_flags & SV_ILP32) { if (td == curthread) { critical_enter(); td->td_pcb->pcb_gsbase = (register_t)tls_base; ==== //depot/projects/vimage-commit2/src/sys/amd64/conf/NOTES#5 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.86 2009/02/07 00:01:10 wkoszek Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.87 2009/02/24 00:39:48 thompsa Exp $ # # @@ -509,5 +509,5 @@ options VM_KMEM_SIZE_SCALE # Enable NDIS binary driver support -options NDISAPI -device ndis +#options NDISAPI +#device ndis ==== //depot/projects/vimage-commit2/src/sys/arm/at91/files.at91#3 (text) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/at91/files.at91,v 1.9 2008/11/25 19:05:46 imp Exp $ +# $FreeBSD: src/sys/arm/at91/files.at91,v 1.10 2009/02/27 23:12:28 imp Exp $ arm/arm/cpufunc_asm_arm9.S standard arm/arm/irq_dispatch.S standard arm/at91/at91_machdep.c standard @@ -15,10 +15,10 @@ arm/at91/at91_twi.c optional at91_twi arm/at91/at91_udp.c optional at91_udp arm/at91/if_ate.c optional ate -arm/at91/ohci_atmelarm.c optional ohci arm/at91/uart_bus_at91usart.c optional uart arm/at91/uart_cpu_at91rm9200usart.c optional uart arm/at91/uart_dev_at91usart.c optional uart +dev/usb/controller/ohci_atmelarm.c optional ohci # # All the boards we support # ==== //depot/projects/vimage-commit2/src/sys/arm/mv/files.mv#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/arm/mv/files.mv,v 1.4 2009/02/16 21:42:41 marcel Exp $ +# $FreeBSD: src/sys/arm/mv/files.mv,v 1.5 2009/02/24 23:30:52 thompsa Exp $ # # The Marvell CPU cores # - Compliant with V5TE architecture @@ -32,5 +32,4 @@ dev/uart/uart_bus_mbus.c optional uart dev/uart/uart_cpu_mv.c optional uart dev/uart/uart_dev_ns8250.c optional uart -dev/usb/ehci_mbus.c optional ehci -dev/usb2/controller/ehci2_mbus.c optional usb2_core usb2_controller usb2_controller_ehci +dev/usb/controller/ehci_mbus.c optional ehci ==== //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/files.ixp425#3 (text+ko) ==== @@ -1,4 +1,4 @@ -#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.8 2009/02/03 19:16:04 sam Exp $ +#$FreeBSD: src/sys/arm/xscale/ixp425/files.ixp425,v 1.9 2009/02/24 23:34:02 thompsa Exp $ arm/arm/bus_space_generic.c standard arm/arm/cpufunc_asm_xscale.S standard arm/arm/irq_dispatch.S standard @@ -46,4 +46,5 @@ # arm/xscale/ixp425/ixp425_qmgr.c optional qmgr # -dev/usb/ehci_ixp4xx.c optional ehci +dev/usb/controller/ehci_ixp4xx.c optional ehci usb +legacy/dev/usb/ehci_ixp4xx.c optional ehci ousb ==== //depot/projects/vimage-commit2/src/sys/boot/i386/btx/btx/btx.S#3 (text+ko) ==== @@ -12,7 +12,7 @@ * warranties of merchantability and fitness for a particular * purpose. * - * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.47 2008/08/08 19:39:11 jhb Exp $ + * $FreeBSD: src/sys/boot/i386/btx/btx/btx.S,v 1.48 2009/02/24 23:11:15 jhb Exp $ */ /* @@ -36,6 +36,7 @@ /* * Fields in %eflags. */ + .set PSL_RESERVED_DEFAULT,0x00000002 .set PSL_T,0x00000100 # Trap flag .set PSL_I,0x00000200 # Interrupt enable flag .set PSL_VM,0x00020000 # Virtual 8086 mode flag @@ -455,6 +456,18 @@ * -0x3c %fs * -0x40 %ds * -0x44 %es + * -0x48 zero %eax (hardware int only) + * -0x4c zero %ecx (hardware int only) + * -0x50 zero %edx (hardware int only) + * -0x54 zero %ebx (hardware int only) + * -0x58 zero %esp (hardware int only) + * -0x5c zero %ebp (hardware int only) + * -0x60 zero %esi (hardware int only) + * -0x64 zero %edi (hardware int only) + * -0x68 zero %gs (hardware int only) + * -0x6c zero %fs (hardware int only) + * -0x70 zero %ds (hardware int only) + * -0x74 zero %es (hardware int only) */ int_hw: cld # String ops inc pusha # Save gp regs @@ -467,12 +480,15 @@ pushl %ds # address popl %es # data leal 0x44(%esp,1),%esi # Base of frame + movl %esp,MEM_ESPR-0x04 # Save kernel stack pointer movl -0x14(%esi),%eax # Get Int no cmpl $-1,%eax # Hardware interrupt? - jne intusr.2 # Yes + jne intusr.1 # Yes /* - * v86 calls save the btx_v86 pointer on the real mode stack and read the - * address and flags from the btx_v86 structure. + * v86 calls save the btx_v86 pointer on the real mode stack and read + * the address and flags from the btx_v86 structure. For interrupt + * handler invocations (VM86 INTx requests), disable interrupts, + * tracing, and alignment checking while the handler runs. */ movl $MEM_USR,%ebx # User base movl %ebx,%edx # address @@ -482,35 +498,36 @@ movl %edx,MEM_ESPR-0x08 # Save btx_v86 ptr movl V86_ADDR(%edx),%eax # Get int no/address movl V86_CTL(%edx),%edx # Get control flags + movl -0x08(%esi),%ebx # Save user flags in %ebx + testl $V86F_ADDR,%edx # Segment:offset? + jnz intusr.4 # Yes + andl $~(PSL_I|PSL_T|PSL_AC),%ebx # Disable interrupts, tracing, + # and alignment checking for + # interrupt handler jmp intusr.3 # Skip hardware interrupt /* - * Hardware interrupts store a NULL btx_v86 pointer and use the address - * (interrupt number) from the stack with empty flags. Also, we clear - * the segment registers for the interrupt handler. + * Hardware interrupts store a NULL btx_v86 pointer and use the + * address (interrupt number) from the stack with empty flags. Also, + * push a dummy frame of zeros onto the stack for all the general + * purpose and segment registers and clear %eflags. This gives the + * hardware interrupt handler a clean slate. */ -intusr.2: xorl %edx,%edx # Control flags +intusr.1: xorl %edx,%edx # Control flags movl %edx,MEM_ESPR-0x08 # NULL btx_v86 ptr - movl %edx,-0x38(%esi) # Real mode %gs of 0 - movl %edx,-0x3c(%esi) # Real mode %fs of 0 - movl %edx,-0x40(%esi) # Real mode %ds of 0 - movl %edx,-0x44(%esi) # Real mode %es of 0 + movl $12,%ecx # Frame is 12 dwords +intusr.2: pushl $0x0 # Fill frame + loop intusr.2 # with zeros + movl $PSL_RESERVED_DEFAULT,%ebx # Set clean %eflags /* - * %eax now holds either the interrupt number or segment:offset of function. - * %edx now holds the V86F_* flags. - * - * For interrupt handler invocations (either hardware interrupts or VM86 - * INTx requests) we also disable interrupts, tracing, and alignment checking - * while the handler runs. + * Look up real mode IDT entry for hardware interrupts and VM86 INTx + * requests. */ -intusr.3: movl -0x08(%esi),%ebx # Save user flags in %ebx - testl $V86F_ADDR,%edx # Segment:offset? - jnz intusr.4 # Yes - shll $0x2,%eax # Scale +intusr.3: shll $0x2,%eax # Scale movl (%eax),%eax # Load int vector - andl $~(PSL_I|PSL_T|PSL_AC),%ebx # Disable interrupts, tracing, - # and alignment checking for - # interrupt handler jmp intusr.5 # Skip CALLF test +/* + * Panic if V86F_CALLF isn't set with V86F_ADDR. + */ intusr.4: testl $V86F_CALLF,%edx # Far call? jnz intusr.5 # Ok movl %edx,0x30(%esp,1) # Place VM86 flags in int no @@ -522,6 +539,11 @@ popl %gs popal # Restore gp regs jmp ex_noc # Panic +/* + * %eax now holds the segment:offset of the function. + * %ebx now holds the %eflags to pass to real mode. + * %edx now holds the V86F_* flags. + */ intusr.5: movw %bx,MEM_ESPR-0x12 # Pass user flags to real mode # target /* @@ -536,8 +558,7 @@ rep # from btx_v86 movsl # to kernel stack popl %esi # Restore -intusr.6: movl %esp,MEM_ESPR-0x04 # Save kernel stack pointer - movl -0x08(%esi),%ebx # Copy user flags to real +intusr.6: movl -0x08(%esi),%ebx # Copy user flags to real movl %ebx,MEM_ESPR-0x0c # mode return trampoline movl $rret_tramp,%ebx # Set return trampoline movl %ebx,MEM_ESPR-0x10 # CS:IP @@ -611,9 +632,16 @@ movb $SEL_TSS,%cl # Set task ltr %cx # register /* - * Now we are back in protected mode. Copy the registers off of the real - * mode stack onto the kernel stack. Also, initialize all the seg regs on - * the kernel stack. + * Now we are back in protected mode. The kernel stack frame set up + * before entering real mode is still intact. For hardware interrupts, + * leave the frame unchanged. + */ + cmpl $0,MEM_ESPR-0x08 # Leave saved regs unchanged + jz rret_tramp.3 # for hardware ints +/* + * For V86 calls, copy the registers off of the real mode stack onto + * the kernel stack as we want their updated values. Also, initialize + * the segment registers on the kernel stack. * * Note that the %esp in the kernel stack after this is garbage, but popa * ignores it, so we don't have to fix it up. @@ -624,20 +652,17 @@ movl $8,%ecx # Copy GP regs from rep # real mode stack movsl # to kernel stack - popl %esi # Restore movl $SEL_UDATA,%eax # Selector for data seg regs movl $4,%ecx # Initialize %ds, rep # %es, %fs, and stosl # %gs /* - * If this was a V86 call, copy the saved seg regs on the real mode stack - * back over to the btx_v86 structure. Also, conditionally update the saved - * eflags on the kernel stack based on the flags from the user. + * For V86 calls, copy the saved seg regs on the real mode stack back + * over to the btx_v86 structure. Also, conditionally update the + * saved eflags on the kernel stack based on the flags from the user. */ movl MEM_ESPR-0x08,%ecx # Get btx_v86 ptr - jecxz rret_tramp.3 # Skip for hardware ints leal V86_GS(%ecx),%edi # %edi => btx_v86 seg regs - pushl %esi # Save leal MEM_ESPR-0x2c,%esi # %esi => real mode seg regs xchgl %ecx,%edx # Save btx_v86 ptr movl $4,%ecx # Copy seg regs ==== //depot/projects/vimage-commit2/src/sys/bsm/audit.h#5 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#4 - * $FreeBSD: src/sys/bsm/audit.h,v 1.14 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit.h#5 + * $FreeBSD: src/sys/bsm/audit.h,v 1.15 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_H @@ -66,8 +66,9 @@ #define AUDIT_TRIGGER_CLOSE_AND_DIE 4 /* Terminate audit. */ #define AUDIT_TRIGGER_NO_SPACE 5 /* Below min free space. */ #define AUDIT_TRIGGER_ROTATE_USER 6 /* User requests rotate. */ -#define AUDIT_TRIGGER_INITIALIZE 7 /* Initialize audit. */ -#define AUDIT_TRIGGER_MAX 7 +#define AUDIT_TRIGGER_INITIALIZE 7 /* User initialize of auditd. */ +#define AUDIT_TRIGGER_EXPIRE_TRAILS 8 /* User expiration of trails. */ +#define AUDIT_TRIGGER_MAX 8 /* * The special device filename (FreeBSD). ==== //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#6 (text) ==== @@ -26,8 +26,8 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#4 - * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.18 2009/01/14 10:44:16 rwatson Exp $ + * P4: //depot/projects/trustedbsd/openbsm/sys/bsm/audit_kevents.h#5 + * $FreeBSD: src/sys/bsm/audit_kevents.h,v 1.19 2009/03/02 13:29:18 rwatson Exp $ */ #ifndef _BSM_AUDIT_KEVENTS_H_ @@ -587,6 +587,8 @@ #define AUE_CAP_GETMODE 43189 /* TrustedBSD. */ #define AUE_POSIX_SPAWN 43190 /* Darwin. */ #define AUE_FSGETPATH 43191 /* Darwin. */ +#define AUE_PREAD 43192 /* Darwin/FreeBSD. */ +#define AUE_PWRITE 43193 /* Darwin/FreeBSD. */ /* * Darwin BSM uses a number of AUE_O_* definitions, which are aliased to the @@ -658,7 +660,6 @@ /* * Possible desired future values based on review of BSD/Darwin system calls. */ -#define AUE_ACCESSEXTENDED AUE_NULL #define AUE_ATGETMSG AUE_NULL #define AUE_ATPUTMSG AUE_NULL #define AUE_ATSOCKET AUE_NULL @@ -669,11 +670,9 @@ #define AUE_BSDTHREADCREATE AUE_NULL #define AUE_BSDTHREADTERMINATE AUE_NULL #define AUE_BSDTHREADREGISTER AUE_NULL -#define AUE_CHMODEXTENDED AUE_NULL #define AUE_CHUD AUE_NULL #define AUE_CSOPS AUE_NULL #define AUE_DUP AUE_NULL -#define AUE_FCHMODEXTENDED AUE_NULL #define AUE_FDATASYNC AUE_NULL #define AUE_FFSCTL AUE_NULL #define AUE_FGETATTRLIST AUE_NULL @@ -683,11 +682,10 @@ #define AUE_FSCTL AUE_NULL #define AUE_FSETATTRLIST AUE_NULL #define AUE_FSETXATTR AUE_NULL -#define AUE_FSTATEXTENDED AUE_NULL #define AUE_FSTATFS64 AUE_NULL #define AUE_FSTATV AUE_NULL #define AUE_FSTAT64 AUE_NULL -#define AUE_FSTAT64EXTENDED AUE_NULL +#define AUE_FSTAT64_EXTENDED AUE_NULL #define AUE_GCCONTROL AUE_NULL #define AUE_GETDIRENTRIES64 AUE_NULL #define AUE_GETDTABLESIZE AUE_NULL @@ -721,21 +719,15 @@ #define AUE_ISSETUGID AUE_NULL #define AUE_LIOLISTIO AUE_NULL #define AUE_LISTXATTR AUE_NULL -#define AUE_LSTATEXTENDED AUE_NULL #define AUE_LSTATV AUE_NULL #define AUE_LSTAT64 AUE_NULL -#define AUE_LSTAT64EXTENDED AUE_NULL +#define AUE_LSTAT64_EXTENDED AUE_NULL #define AUE_MADVISE AUE_NULL #define AUE_MINCORE AUE_NULL #define AUE_MKCOMPLEX AUE_NULL -#define AUE_MKDIREXTENDED AUE_NULL -#define AUE_MKFIFOEXTENDED AUE_NULL #define AUE_MODWATCH AUE_NULL #define AUE_MSGCL AUE_NULL #define AUE_MSYNC AUE_NULL -#define AUE_OPENEXTENDED AUE_NULL -#define AUE_PREAD AUE_NULL -#define AUE_PWRITE AUE_NULL #define AUE_PREADV AUE_NULL #define AUE_PROCINFO AUE_NULL #define AUE_PTHREADCANCELED AUE_NULL @@ -779,15 +771,13 @@ #define AUE_SIGWAIT AUE_NULL #define AUE_SSTK AUE_NULL #define AUE_STACKSNAPSHOT AUE_NULL -#define AUE_STATEXTENDED AUE_NULL #define AUE_STATFS64 AUE_NULL #define AUE_STATV AUE_NULL #define AUE_STAT64 AUE_NULL -#define AUE_STAT64EXTENDED AUE_NULL +#define AUE_STAT64_EXTENDED AUE_NULL #define AUE_SYNC AUE_NULL #define AUE_SYSCALL AUE_NULL #define AUE_TABLE AUE_NULL -#define AUE_UMASKEXTENDED AUE_NULL #define AUE_VMPRESSUREMONITOR AUE_NULL #define AUE_WAITEVENT AUE_NULL #define AUE_WAITID AUE_NULL ==== //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c#5 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.13 2008/11/17 20:49:29 pjd Exp $"); +__FBSDID("$FreeBSD: src/sys/cddl/compat/opensolaris/kern/opensolaris_vfs.c,v 1.14 2009/03/02 23:26:30 jamie Exp $"); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200903041248.n24CmXQU096348>