PERFORCE change 166119 for review
Marko Zec
zec at FreeBSD.org
Wed Jul 15 07:38:46 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=166119
Change 166119 by zec at zec_amdx4 on 2009/07/15 07:37:45
IFC @ 166116
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#8 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/exception.S#6 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/intr_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/io_apic.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/msi.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/pmap.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/sys_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/vm_machdep.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/conf/GENERIC#18 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_exception.S#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_reg.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/ia32/ia32_signal.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/intr_machdep.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/param.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/pcb.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/pmap.h#9 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/vm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/isa/atpic.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/linux32/linux32_sysvec.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/pci/pci_bus.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/param.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/pmap.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/vm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_machdep.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/sa11x0/assabet_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/bsm/audit_kevents.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/ata/ata_all.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/cam/ata/ata_all.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/cam/ata/ata_da.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/cam/ata/ata_xpt.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/cam/cam.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/cam.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/cam_ccb.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/cam_periph.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/cam_xpt.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/cam_xpt.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/cam_xpt_internal.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/cam/cam_xpt_periph.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_all.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_cd.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_ch.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_da.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_pass.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_pt.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sa.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_ses.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_sg.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_xpt.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/cddl/compat/opensolaris/sys/sig.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/contrib/opensolaris/common/nvpair/nvpair.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#18 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#18 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#18 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_signal.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_socket.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_stat.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/NOTES#34 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files#47 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/newvers.sh#7 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/options#36 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslcompile.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/dev/acpica/compiler/aslutils.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/dev/mwl/mw88W8363.fw.uu#2 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_subr.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pfvar.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/ddb/db_expr.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/ddb/db_sym.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/ddb/db_variables.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/ddb/db_variables.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/ddb/ddb.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/aac/aac_disk.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_hp.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_wmi.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_wmi_if.m#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpica/acpi_pcib_acpi.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/advansys/advansys.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/advansys/advlib.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ahci/ahci.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ahci/ahci.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aic79xx_osm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/aic7xxx/aic7xxx_osm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ale/if_ale.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/amd/amd.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-cam.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/atapi-cd.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ahci.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ah_osdep.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ah_osdep.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ah_internal.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_attach.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5212/ar5212_recv.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_attach.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/ath_hal/ar5416/ar5416_reset.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/if_athvar.h#14 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ciss/ciss.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ciss/cissvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cpuctl/cpuctl.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_pciids.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/r600_cp.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_drv.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82542.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hptrr/hptrr_config.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ipw/if_ipw.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/isp/isp_freebsd.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iwi/if_iwi.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iwn/if_iwn.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mfi/mfi.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mfi/mfivar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mlx/mlx.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mlx/mlxvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mpt/mpt.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mpt/mpt_cam.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mpt/mpt_pci.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mwl/if_mwl.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mwl/if_mwlvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mwl/mwlhal.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mwl/mwlhal.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mwl/mwlreg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2560.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ral/rt2661.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_rate.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/usb/uaudio.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/trm/trm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/at91dci.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/atmegadci.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/avr32dci.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/musb_otg.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/controller/uss820dci.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cdce.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/serial/usb_serial.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/ustorage_fs.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_busdma.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_controller.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_device.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_handle_request.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_if.m#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usb_transfer.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdi.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtw.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wpi/if_wpi.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/xl/if_xl.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/cd9660/cd9660_lookup.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/fifofs/fifo_vnops.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_commonkrpc.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfs_var.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfs/nfsport.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clrpcops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clstate.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvnops.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfsserver/nfs_nfsdport.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_dev.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_io.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_subr.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_vfs.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/journal/g_journal.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/part/g_part_if.m#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/conf/GENERIC#18 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/genassym.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/intr_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/io_apic.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/local_apic.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/msi.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/pmap.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/sys_machdep.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_misc.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/intr_machdep.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/param.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/pmap.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/vm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/isa/atpic.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/pci/pci_bus.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/xen/pmap.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/conf/GENERIC#7 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/ia64/pmap.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/include/param.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/include/pmap.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/include/vm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/init_sysent.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_event.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_exec.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_exit.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_intr.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_linker.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_mbuf.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_prot.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_synch.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_sysctl.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_thr.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_thread.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#57 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/link_elf.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/link_elf_obj.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_param.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_sleepqueue.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_trap.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_generic.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_pipe.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_process.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_socket.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/syscalls.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/syscalls.master#10 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/systrace_args.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty.c#29 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty_pts.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_domain.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_socket.c#28 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_syscalls.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_cluster.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_export.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_extattr.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_lookup.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_mount.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_subr.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_syscalls.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/vfs_vnops.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/include/param.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/include/pmap.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/include/vm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/malta/yamon.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/busdma_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/dump_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/intr_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/Makefile#27 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ahci/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/cam/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/geom/geom_label/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/nfsclient/Makefile#7 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/nfsserver/Makefile#5 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/wlan/Makefile#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/net/flowtable.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net/flowtable.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if.c#80 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_bridge.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_clone.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_enc.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#32 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_faith.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_gif.c#32 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_gif.h#13 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_gre.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_loop.c#38 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_media.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_var.h#35 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/net/netisr.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/net/raw_cb.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/net/route.c#46 integrate
.. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#33 integrate
.. //depot/projects/vimage-commit2/src/sys/net/vnet.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/net/vnet.h#28 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/_ieee80211.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.h#12 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_action.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_action.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_adhoc.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ageq.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ageq.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_freebsd.h#12 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hostap.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ht.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_hwmp.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_input.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ioctl.h#9 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_mesh.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_mesh.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_node.h#13 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_output.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_proto.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_scan_sta.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_sta.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_var.h#17 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_wds.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/netgraph.h#29 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_base.c#36 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#29 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_gif.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#25 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ksocket.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/icmp6.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/icmp_var.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#39 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#44 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in.c#32 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#45 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#22 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#35 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#33 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fastfwd.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_fw.h#28 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#48 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_ipsec.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#35 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_var.h#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw2.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw_nat.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw_pfil.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#35 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/sctp_os_bsd.h#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#30 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#41 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_output.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_reass.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_sack.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_subr.c#56 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.c#39 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_syncache.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timer.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_timewait.c#30 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_var.h#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_usrreq.c#44 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/udp_var.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/vinet.h#37 delete
.. //depot/projects/vimage-commit2/src/sys/netinet6/dest6.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#32 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_gif.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#33 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_mcast.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_proto.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#36 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#22 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_var.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_forward.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#37 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_ipsec.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_var.h#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#39 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#27 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#30 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#29 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/route6.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/tcp6_var.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#25 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#27 delete
.. //depot/projects/vimage-commit2/src/sys/netipsec/ah_var.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/esp_var.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipcomp_var.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipip_var.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.c#36 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec6.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_input.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_mbuf.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/ipsec_output.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#36 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/key_debug.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/key_debug.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/keysock.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/vipsec.h#22 delete
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ah.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_esp.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipcomp.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_ipip.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/xform_tcp.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/nfs/nfs_common.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfs/nfs_nfssvc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/nfs/rpcv2.h#2 delete
.. //depot/projects/vimage-commit2/src/sys/nfsclient/bootp_subr.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/krpc_subr.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs.h#9 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_bio.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_krpc.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_lock.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_nfsiod.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_node.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_subs.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vfsops.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfsm_subs.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfsmount.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_fha.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_serv.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvcache.c#4 delete
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvkrpc.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsock.c#9 delete
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_srvsubs.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfs_syscalls.c#10 delete
.. //depot/projects/vimage-commit2/src/sys/nfsserver/nfsrvcache.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/pc98/conf/GENERIC#11 integrate
.. //depot/projects/vimage-commit2/src/sys/pci/if_rlreg.h#13 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea64.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/conf/GENERIC#13 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/include/param.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/include/pmap.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/include/vm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/clnt_dg.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/clnt_rc.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/clnt_vc.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss/rpcsec_gss.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit_arg.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit_bsm.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit_private.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/security/audit/audit_syscalls.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#16 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/param.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/pmap.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/vm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/pmap.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/conf/GENERIC#10 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/include/param.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/include/pmap.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/include/vm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/pmap.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/cpuctl.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/disk.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/event.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/filio.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/mount.h#15 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/namei.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/param.h#49 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/pcpu.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/priv.h#14 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/proc.h#22 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/signalvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/sleepqueue.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/socketvar.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/syscall.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/syscall.mk#10 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/syscallsubr.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#24 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/sysproto.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/vimage.h#78 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#17 integrate
.. //depot/projects/vimage-commit2/src/sys/tools/sound/feeder_rate_mkfilter.awk#3 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_softdep.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ffs/ffs_vnops.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_vnops.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/device_pager.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/pmap.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_contig.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_extern.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_fault.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_map.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_object.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_object.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_page.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_phys.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_phys.h#3 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/cpu_switch.S#8 (text+ko) ====
@@ -30,7 +30,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.168 2009/04/01 13:09:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/cpu_switch.S,v 1.169 2009/07/09 09:34:11 kib Exp $
*/
#include <machine/asmacros.h>
@@ -97,6 +97,7 @@
ENTRY(cpu_switch)
/* Switch to new thread. First, save context. */
movq TD_PCB(%rdi),%r8
+ movb $1,PCB_FULL_IRET(%r8)
movq (%rsp),%rax /* Hardware registers */
movq %r15,PCB_R15(%r8)
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/exception.S#6 (text+ko) ====
@@ -31,7 +31,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.138 2009/04/01 13:09:26 kib Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.140 2009/07/10 10:29:16 kib Exp $
*/
#include "opt_atpic.h"
@@ -162,19 +162,20 @@
.globl alltraps
.type alltraps, at function
alltraps:
+ movq %rdi,TF_RDI(%rsp)
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz alltraps_testi /* already running with kernel GS.base */
swapgs
+ movq PCPU(CURPCB),%rdi
+ movb $0,PCB_FULL_IRET(%rdi)
movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
alltraps_testi:
testl $PSL_I,TF_RFLAGS(%rsp)
- jz alltraps_pushregs
+ jz alltraps_pushregs_no_rdi
sti
-alltraps_pushregs:
- movq %rdi,TF_RDI(%rsp)
alltraps_pushregs_no_rdi:
movq %rsi,TF_RSI(%rsp)
movq %rdx,TF_RDX(%rsp)
@@ -233,14 +234,17 @@
.globl alltraps_noen
.type alltraps_noen, at function
alltraps_noen:
+ movq %rdi,TF_RDI(%rsp)
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 1f /* already running with kernel GS.base */
swapgs
+ movq PCPU(CURPCB),%rdi
+ movb $0,PCB_FULL_IRET(%rdi)
1: movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
- jmp alltraps_pushregs
+ jmp alltraps_pushregs_no_rdi
IDTVEC(dblfault)
subq $TF_ERR,%rsp
@@ -278,12 +282,13 @@
IDTVEC(page)
subq $TF_ERR,%rsp
movl $T_PAGEFLT,TF_TRAPNO(%rsp)
+ movq %rdi,TF_RDI(%rsp) /* free up a GP register */
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 1f /* already running with kernel GS.base */
swapgs
-1:
- movq %rdi,TF_RDI(%rsp) /* free up a GP register */
- movq %cr2,%rdi /* preserve %cr2 before .. */
+ movq PCPU(CURPCB),%rdi
+ movb $0,PCB_FULL_IRET(%rdi)
+1: movq %cr2,%rdi /* preserve %cr2 before .. */
movq %rdi,TF_ADDR(%rsp) /* enabling interrupts. */
movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
@@ -311,7 +316,9 @@
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 2f /* already running with kernel GS.base */
1: swapgs
-2: movw %fs,TF_FS(%rsp)
+2: movq PCPU(CURPCB),%rdi
+ movb $1,PCB_FULL_IRET(%rdi) /* always full iret from GPF */
+ movw %fs,TF_FS(%rsp)
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
@@ -341,6 +348,8 @@
movw %gs,TF_GS(%rsp)
movw %es,TF_ES(%rsp)
movw %ds,TF_DS(%rsp)
+ movq PCPU(CURPCB),%r11
+ movb $0,PCB_FULL_IRET(%r11)
sti
movq $KUDSEL,TF_SS(%rsp)
movq $KUCSEL,TF_CS(%rsp)
@@ -644,7 +653,8 @@
*/
testb $SEL_RPL_MASK,TF_CS(%rsp)
jz ld_regs
-
+ cmpb $0,PCB_FULL_IRET(%r8)
+ je ld_regs
testl $TF_HASSEGS,TF_FLAGS(%rsp)
je set_segs
@@ -756,38 +766,38 @@
.globl ds_load_fault
ds_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movzwl TF_DS(%rsp),%edx
- movl %edx,TF_ERR(%rsp)
+ movq %rsp, %rdi
+ call trap
movw $KUDSEL,TF_DS(%rsp)
- jmp calltrap
+ jmp doreti
ALIGN_TEXT
.globl es_load_fault
es_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movzwl TF_ES(%rsp),%edx
- movl %edx,TF_ERR(%rsp)
+ movq %rsp, %rdi
+ call trap
movw $KUDSEL,TF_ES(%rsp)
- jmp calltrap
+ jmp doreti
ALIGN_TEXT
.globl fs_load_fault
fs_load_fault:
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movzwl TF_FS(%rsp),%edx
- movl %edx,TF_ERR(%rsp)
+ movq %rsp, %rdi
+ call trap
movw $KUF32SEL,TF_FS(%rsp)
- jmp calltrap
+ jmp doreti
ALIGN_TEXT
.globl gs_load_fault
gs_load_fault:
popfq
movl $T_PROTFLT,TF_TRAPNO(%rsp)
- movzwl TF_GS(%rsp),%edx
- movl %edx,TF_ERR(%rsp)
+ movq %rsp, %rdi
+ call trap
movw $KUG32SEL,TF_GS(%rsp)
- jmp calltrap
+ jmp doreti
#ifdef HWPMC_HOOKS
ENTRY(end_exceptions)
#endif
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/genassym.c#7 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.175 2009/04/01 18:36:34 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.177 2009/07/09 09:34:11 kib Exp $");
#include "opt_compat.h"
#include "opt_hwpmc_hooks.h"
@@ -64,7 +64,6 @@
#include <net/if.h>
#include <netinet/in.h>
#include <nfs/nfsproto.h>
-#include <nfs/rpcv2.h>
#include <nfsclient/nfs.h>
#include <nfsclient/nfsdiskless.h>
#include <machine/apicreg.h>
@@ -142,6 +141,7 @@
ASSYM(PCB_DR6, offsetof(struct pcb, pcb_dr6));
ASSYM(PCB_DR7, offsetof(struct pcb, pcb_dr7));
ASSYM(PCB_TSSP, offsetof(struct pcb, pcb_tssp));
+ASSYM(PCB_FULL_IRET, offsetof(struct pcb, pcb_full_iret));
ASSYM(PCB_DBREGS, PCB_DBREGS);
ASSYM(PCB_32BIT, PCB_32BIT);
ASSYM(PCB_GS32BIT, PCB_GS32BIT);
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/identcpu.c#10 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.173 2009/05/04 18:05:27 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.174 2009/06/30 11:16:32 avg Exp $");
#include "opt_cpu.h"
@@ -107,9 +107,6 @@
};
-extern int pq_l2size;
-extern int pq_l2nways;
-
void
printcpuinfo(void)
{
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/intr_machdep.c#4 (text+ko) ====
@@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.44 2009/06/25 20:35:46 jhb Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.45 2009/07/01 17:20:07 jhb Exp $
*/
/*
@@ -163,8 +163,8 @@
}
int
-intr_add_handler(const char *name, int vector, driver_filter_t filter,
- driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep)
+intr_add_handler(const char *name, int vector, driver_filter_t filter,
+ driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep)
{
struct intsrc *isrc;
int error;
@@ -302,7 +302,8 @@
intr_assign_cpu(void *arg, u_char cpu)
{
#ifdef SMP
- struct intsrc *isrc;
+ struct intsrc *isrc;
+ int error;
/*
* Don't do anything during early boot. We will pick up the
@@ -311,10 +312,11 @@
if (assign_cpu && cpu != NOCPU) {
isrc = arg;
mtx_lock(&intr_table_lock);
- isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]);
+ error = isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]);
mtx_unlock(&intr_table_lock);
- }
- return (0);
+ } else
+ error = 0;
+ return (error);
#else
return (EOPNOTSUPP);
#endif
@@ -371,7 +373,7 @@
intrcnt_setname("???", 0);
intrcnt_index = 1;
STAILQ_INIT(&pics);
- mtx_init(&intr_table_lock, "intr sources", NULL, MTX_DEF | MTX_RECURSE);
+ mtx_init(&intr_table_lock, "intr sources", NULL, MTX_DEF);
mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN);
}
SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL);
@@ -441,14 +443,14 @@
if (!assign_cpu)
return (cpu_apic_ids[0]);
- mtx_lock(&intr_table_lock);
+ mtx_lock_spin(&icu_lock);
apic_id = cpu_apic_ids[current_cpu];
do {
current_cpu++;
if (current_cpu > mp_maxid)
current_cpu = 0;
} while (!(intr_cpus & (1 << current_cpu)));
- mtx_unlock(&intr_table_lock);
+ mtx_unlock_spin(&icu_lock);
return (apic_id);
}
@@ -489,7 +491,6 @@
intr_shuffle_irqs(void *arg __unused)
{
struct intsrc *isrc;
- u_int apic_id;
int i;
/* Don't bother on UP. */
@@ -505,13 +506,17 @@
/*
* If this event is already bound to a CPU,
* then assign the source to that CPU instead
- * of picking one via round-robin.
+ * of picking one via round-robin. Note that
+ * this is careful to only advance the
+ * round-robin if the CPU assignment succeeds.
*/
if (isrc->is_event->ie_cpu != NOCPU)
- apic_id = isrc->is_event->ie_cpu;
- else
- apic_id = intr_next_cpu();
- isrc->is_pic->pic_assign_cpu(isrc, apic_id);
+ (void)isrc->is_pic->pic_assign_cpu(isrc,
+ isrc->is_event->ie_cpu);
+ else if (isrc->is_pic->pic_assign_cpu(isrc,
+ cpu_apic_ids[current_cpu]) == 0)
+ (void)intr_next_cpu();
+
}
}
mtx_unlock(&intr_table_lock);
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/io_apic.c#4 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.33 2009/06/25 18:13:46 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.35 2009/07/06 18:23:00 jhb Exp $");
#include "opt_isa.h"
@@ -120,7 +120,7 @@
static int ioapic_config_intr(struct intsrc *isrc, enum intr_trigger trig,
enum intr_polarity pol);
static void ioapic_resume(struct pic *pic);
-static void ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id);
+static int ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id);
static void ioapic_program_intpin(struct ioapic_intsrc *intpin);
static STAILQ_HEAD(,ioapic) ioapic_list = STAILQ_HEAD_INITIALIZER(ioapic_list);
@@ -322,12 +322,12 @@
mtx_unlock_spin(&icu_lock);
}
-static void
+static int
ioapic_assign_cpu(struct intsrc *isrc, u_int apic_id)
{
struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc;
struct ioapic *io = (struct ioapic *)isrc->is_pic;
- u_int old_vector;
+ u_int old_vector, new_vector;
u_int old_id;
/*
@@ -342,14 +342,20 @@
old_vector = intpin->io_vector;
old_id = intpin->io_cpu;
if (old_vector && apic_id == old_id)
- return;
+ return (0);
/*
* Allocate an APIC vector for this interrupt pin. Once
* we have a vector we program the interrupt pin.
*/
+ new_vector = apic_alloc_vector(apic_id, intpin->io_irq);
+ if (new_vector == 0)
+ return (ENOSPC);
+
intpin->io_cpu = apic_id;
- intpin->io_vector = apic_alloc_vector(apic_id, intpin->io_irq);
+ intpin->io_vector = new_vector;
+ if (isrc->is_handlers > 0)
+ apic_enable_vector(intpin->io_cpu, intpin->io_vector);
if (bootverbose) {
printf("ioapic%u: routing intpin %u (", io->io_id,
intpin->io_intpin);
@@ -362,8 +368,12 @@
* Free the old vector after the new one is established. This is done
* to prevent races where we could miss an interrupt.
*/
- if (old_vector)
+ if (old_vector) {
+ if (isrc->is_handlers > 0)
+ apic_disable_vector(old_id, old_vector);
apic_free_vector(old_id, old_vector, intpin->io_irq);
+ }
+ return (0);
}
static void
@@ -372,7 +382,9 @@
struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc;
if (intpin->io_vector == 0)
- ioapic_assign_cpu(isrc, intr_next_cpu());
+ if (ioapic_assign_cpu(isrc, intr_next_cpu()) != 0)
+ panic("Couldn't find an APIC vector for IRQ %d",
+ intpin->io_irq);
apic_enable_vector(intpin->io_cpu, intpin->io_vector);
}
@@ -496,7 +508,7 @@
io->io_pic = ioapic_template;
mtx_lock_spin(&icu_lock);
io->io_id = next_id++;
- io->io_apic_id = ioapic_read(apic, IOAPIC_ID) >> APIC_ID_SHIFT;
+ io->io_apic_id = ioapic_read(apic, IOAPIC_ID) >> APIC_ID_SHIFT;
if (apic_id != -1 && io->io_apic_id != apic_id) {
ioapic_write(apic, IOAPIC_ID, apic_id << APIC_ID_SHIFT);
mtx_unlock_spin(&icu_lock);
@@ -730,7 +742,7 @@
if (pin >= io->io_numintr || trigger == INTR_TRIGGER_CONFORM)
return (EINVAL);
if (io->io_pins[pin].io_irq >= NUM_IO_INTS)
- return (EINVAL);
+ return (EINVAL);
edgetrigger = (trigger == INTR_TRIGGER_EDGE);
if (io->io_pins[pin].io_edgetrigger == edgetrigger)
return (0);
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#11 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.57 2009/06/24 19:16:48 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.58 2009/07/01 17:20:07 jhb Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_kdtrace.h"
@@ -139,7 +139,7 @@
};
-static u_int32_t lapic_timer_divisors[] = {
+static u_int32_t lapic_timer_divisors[] = {
APIC_TDCR_1, APIC_TDCR_2, APIC_TDCR_4, APIC_TDCR_8, APIC_TDCR_16,
APIC_TDCR_32, APIC_TDCR_64, APIC_TDCR_128
};
@@ -797,7 +797,7 @@
return (vector + APIC_IO_INTS);
}
mtx_unlock_spin(&icu_lock);
- panic("Couldn't find an APIC vector for IRQ %u", irq);
+ return (0);
}
/*
@@ -1058,7 +1058,7 @@
static SLIST_HEAD(, apic_enumerator) enumerators =
SLIST_HEAD_INITIALIZER(enumerators);
static struct apic_enumerator *best_enum;
-
+
void
apic_register_enumerator(struct apic_enumerator *enumerator)
{
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#13 (text+ko) ====
@@ -39,7 +39,7 @@
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list