PERFORCE change 130589 for review
Marko Zec
zec at FreeBSD.org
Mon Dec 10 02:25:48 PST 2007
http://perforce.freebsd.org/chv.cgi?CH=130589
Change 130589 by zec at zec_tpx32 on 2007/12/10 10:25:19
IFC
Affected files ...
.. //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/db_trace.c#2 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#3 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#6 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#8 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#7 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/msi.c#5 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/nexus.c#6 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#10 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/prof_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#6 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/vm_machdep.c#4 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/DEFAULTS#3 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#11 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/NOTES#7 integrate
.. //depot/projects/vimage/src/sys/amd64/include/clock.h#3 integrate
.. //depot/projects/vimage/src/sys/amd64/include/pc/bios.h#2 integrate
.. //depot/projects/vimage/src/sys/amd64/include/pci_cfgreg.h#2 integrate
.. //depot/projects/vimage/src/sys/amd64/isa/clock.c#7 integrate
.. //depot/projects/vimage/src/sys/amd64/pci/pci_cfgreg.c#2 integrate
.. //depot/projects/vimage/src/sys/arm/arm/busdma_machdep.c#8 integrate
.. //depot/projects/vimage/src/sys/arm/arm/cpufunc.c#6 integrate
.. //depot/projects/vimage/src/sys/arm/arm/nexus_io.c#2 delete
.. //depot/projects/vimage/src/sys/arm/arm/nexus_io_asm.S#2 delete
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#9 integrate
.. //depot/projects/vimage/src/sys/arm/arm/trap.c#5 integrate
.. //depot/projects/vimage/src/sys/arm/arm/vm_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/arm/at91/at91rm92reg.h#3 integrate
.. //depot/projects/vimage/src/sys/arm/at91/if_ate.c#5 integrate
.. //depot/projects/vimage/src/sys/arm/at91/kb920x_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/arm/at91/ohci_atmelarm.c#4 integrate
.. //depot/projects/vimage/src/sys/arm/at91/std.at91#2 integrate
.. //depot/projects/vimage/src/sys/arm/at91/std.kb920x#2 integrate
.. //depot/projects/vimage/src/sys/arm/at91/uart_cpu_at91rm9200usart.c#4 integrate
.. //depot/projects/vimage/src/sys/arm/conf/AVILA#5 integrate
.. //depot/projects/vimage/src/sys/arm/conf/BWCT#2 integrate
.. //depot/projects/vimage/src/sys/arm/conf/CRB#3 integrate
.. //depot/projects/vimage/src/sys/arm/conf/EP80219#3 integrate
.. //depot/projects/vimage/src/sys/arm/conf/HL200#1 branch
.. //depot/projects/vimage/src/sys/arm/conf/IQ31244#3 integrate
.. //depot/projects/vimage/src/sys/arm/conf/KB920X#4 integrate
.. //depot/projects/vimage/src/sys/arm/conf/SIMICS#3 integrate
.. //depot/projects/vimage/src/sys/arm/conf/SKYEYE#2 integrate
.. //depot/projects/vimage/src/sys/arm/include/asmacros.h#3 integrate
.. //depot/projects/vimage/src/sys/arm/include/atomic.h#3 integrate
.. //depot/projects/vimage/src/sys/arm/include/cpuconf.h#3 integrate
.. //depot/projects/vimage/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/arm/sa11x0/files.sa11x0#2 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/i80321/ep80219_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/i80321/iq31244_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/i8134x/crb_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/avila_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/arm/xscale/ixp425/if_npe.c#5 integrate
.. //depot/projects/vimage/src/sys/boot/arm/at91/boot2/boot2.c#5 integrate
.. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/eeprom.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac.c#5 integrate
.. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/emac_init.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/arm/at91/libat91/lib.h#3 integrate
.. //depot/projects/vimage/src/sys/boot/common/loader.8#5 integrate
.. //depot/projects/vimage/src/sys/boot/common/ufsread.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/boot/i386/boot2/boot2.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/cdboot/cdboot.s#3 integrate
.. //depot/projects/vimage/src/sys/boot/i386/gptboot/Makefile#1 branch
.. //depot/projects/vimage/src/sys/boot/i386/gptboot/gptboot.c#1 branch
.. //depot/projects/vimage/src/sys/boot/i386/gptboot/gptldr.S#1 branch
.. //depot/projects/vimage/src/sys/boot/i386/libi386/bioscd.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/libi386/biosdisk.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/libi386/biosmem.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/libi386/biossmap.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/libi386/devicename.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/i386/loader/main.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/i386/pmbr/Makefile#1 branch
.. //depot/projects/vimage/src/sys/boot/i386/pmbr/pmbr.s#1 branch
.. //depot/projects/vimage/src/sys/boot/pc98/boot2/boot.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/cdboot/cdboot.s#3 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/libpc98/bioscd.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/libpc98/biosdisk.c#2 integrate
.. //depot/projects/vimage/src/sys/boot/pc98/loader/main.c#2 integrate
.. //depot/projects/vimage/src/sys/bsm/audit.h#5 integrate
.. //depot/projects/vimage/src/sys/cam/cam_xpt.c#10 integrate
.. //depot/projects/vimage/src/sys/cam/scsi/scsi_all.h#4 integrate
.. //depot/projects/vimage/src/sys/compat/linprocfs/linprocfs.c#14 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_file.c#7 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_getcwd.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.c#7 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_ioctl.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/linux/linux_misc.c#12 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/ndis_var.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/subr_ndis.c#4 integrate
.. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/kern/opensolaris_vfs.c#4 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/rpc/xdr.h#2 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/bitmap.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cpupart.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/cyclic.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/elf.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kcondvar.h#2 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mman.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/modctl.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/mutex.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/objfs.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/param.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/pcpu.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/proc.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/rwlock.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/stat.h#1 branch
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/time.h#2 integrate
.. //depot/projects/vimage/src/sys/compat/opensolaris/sys/types.h#3 integrate
.. //depot/projects/vimage/src/sys/compat/pecoff/imgact_pecoff.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/imgact_svr4.c#2 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_fcntl.c#3 integrate
.. //depot/projects/vimage/src/sys/compat/svr4/svr4_misc.c#4 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#18 integrate
.. //depot/projects/vimage/src/sys/conf/files#21 integrate
.. //depot/projects/vimage/src/sys/conf/files.amd64#8 integrate
.. //depot/projects/vimage/src/sys/conf/files.arm#4 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#8 integrate
.. //depot/projects/vimage/src/sys/conf/files.ia64#4 integrate
.. //depot/projects/vimage/src/sys/conf/files.pc98#6 integrate
.. //depot/projects/vimage/src/sys/conf/files.powerpc#6 integrate
.. //depot/projects/vimage/src/sys/conf/files.sun4v#5 integrate
.. //depot/projects/vimage/src/sys/conf/kmod.mk#5 integrate
.. //depot/projects/vimage/src/sys/conf/options#20 integrate
.. //depot/projects/vimage/src/sys/conf/options.amd64#3 integrate
.. //depot/projects/vimage/src/sys/conf/options.arm#5 integrate
.. //depot/projects/vimage/src/sys/conf/options.i386#3 integrate
.. //depot/projects/vimage/src/sys/contrib/dev/wpi/LICENSE#1 branch
.. //depot/projects/vimage/src/sys/contrib/dev/wpi/iwlwifi-3945-2.14.4.fw.uu#1 branch
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/fil.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_compat.h#4 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_log.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_nat.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/ipfilter/netinet/ip_state.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/avl/avl.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zfs_znode.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/fs/zfs/zvol.c#3 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/vfs.h#2 delete
.. //depot/projects/vimage/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf.c#9 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_if.c#5 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_ioctl.c#9 integrate
.. //depot/projects/vimage/src/sys/contrib/pf/net/pf_table.c#4 integrate
.. //depot/projects/vimage/src/sys/ddb/db_examine.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac_cam.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/aac/aac_debug.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_ibm.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_battery.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_cpu.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_ec.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_pci_link.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/acpica/acpi_thermal.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/agp/agp.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_ali.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_amd.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_amd64.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_ati.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_i810.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_if.m#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_intel.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_nvidia.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_sis.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agp_via.c#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agppriv.h#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agpreg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/agp/agpvar.h#1 branch
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic_osm_lib.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/aic7xxx/aic_osm_lib.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amr.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/amr/amr_cam.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/an/if_an.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/an/if_anreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/asmc/asmc.c#1 branch
.. //depot/projects/vimage/src/sys/dev/asmc/asmcvar.h#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-chipset.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-disk.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-dma.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/ata-pci.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/ata/atapi-cd.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/atapi-cd.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/atapi-fd.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ata/atapi-tape.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath_pci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/bge/if_bge.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/bktr/msp34xx.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ciss/ciss.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/dc/dcphy.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/dc/if_dc.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drmP.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/drm/drm_agpsupport.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_80003es2lan.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_80003es2lan.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82540.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82541.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82541.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82542.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82543.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82543.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82571.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82571.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82575.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_82575.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_api.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_api.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_defines.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_hw.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_ich8lan.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_ich8lan.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_mac.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_mac.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_manage.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_manage.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_nvm.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_nvm.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_osdep.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_phy.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_phy.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/e1000_regs.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/if_em.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/em/if_em.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/esp/esp_sbus.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/firewire/firewire.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/flash/at45d.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/hptmv/entry.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_logging.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ichsmb/ichsmb_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ichwd/ichwd.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_kcs.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_smic.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ipmi/ipmi_ssif.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_sm.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/iscsi/initiator/isc_soc.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_freebsd.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/isp/isp_sbus.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/iwi/if_iwi.c#8 edit
.. //depot/projects/vimage/src/sys/dev/lge/if_lge.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/md/md.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/mii/amphy.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/mii/e1000phy.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/mii/e1000phyreg.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/mii/gentbi.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/mii/miidevs#8 integrate
.. //depot/projects/vimage/src/sys/dev/mii/nsphy.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/mii/rgephy.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/mii/rgephyreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/mii/rlphy.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/mii/tdkphy.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/mii/ukphy_subr.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/mmc/mmcsd.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt.c#8 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_cam.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/mpt/mpt_raid.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/msk/if_msk.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/msk/if_mskreg.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/nfe/if_nfe.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/nge/if_nge.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/nve/if_nve.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/nvram/nvram.c#1 branch
.. //depot/projects/vimage/src/sys/dev/nxge/if_nxge.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/if_nxge.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/build-version.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/version.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xge-debug.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xge-defs.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xge-list.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xge-os-pal.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xge-os-template.h#2 delete
.. //depot/projects/vimage/src/sys/dev/nxge/include/xge-queue.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-channel.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-config.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-device.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-driver.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-event.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-fifo.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-mgmt.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-mgmtaux.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-mm.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-regs.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-ring.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-stats.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal-types.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/include/xgehal.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xge-osdep.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xge-queue.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-channel-fp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-channel.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-config.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-device-fp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-device.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-driver.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-fifo-fp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-fifo.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-mgmt.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-mgmtaux.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-mm.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-ring-fp.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-ring.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgehal/xgehal-stats.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/nxge/xgell-version.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ofw/ofw_disk.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/pccbb/pccbb.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/pccbb/pccbb_pci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/pci/pci_user.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2560.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/ral/rt2661.c#10 integrate
.. //depot/projects/vimage/src/sys/dev/random/harvest.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/random/randomdev_soft.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/random/yarrow.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/re/if_re.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/safe/safe.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/si/si_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sio/sio_isa.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/sio/sio_puc.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/sk/if_sk.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/sound/midi/sequencer.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/atiixp.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#14 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/t4dwave.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/ac97_patch.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/stge/if_stge.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/ti/if_ti.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ehci_pci.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_axe.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_axereg.h#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_rum.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_ural.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_zyd.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_zydfw.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/usb/if_zydreg.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uhci_pci.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uipaq.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/usb/ukbd.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_port.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb_quirks.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#15 integrate
.. //depot/projects/vimage/src/sys/dev/utopia/utopia.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/vge/if_vge.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/vx/if_vx_pci.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/wpi/if_wpi.c#1 branch
.. //depot/projects/vimage/src/sys/dev/wpi/if_wpireg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/wpi/if_wpivar.h#1 branch
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_devs.c#3 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#8 integrate
.. //depot/projects/vimage/src/sys/fs/msdosfs/denode.h#4 integrate
.. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_fat.c#8 integrate
.. //depot/projects/vimage/src/sys/fs/msdosfs/msdosfs_vfsops.c#12 integrate
.. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate
.. //depot/projects/vimage/src/sys/fs/ntfs/ntfs_vfsops.c#5 integrate
.. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs.h#5 integrate
.. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_subr.c#5 integrate
.. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vfsops.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/tmpfs/tmpfs_vnops.c#7 integrate
.. //depot/projects/vimage/src/sys/fs/unionfs/union_subr.c#8 integrate
.. //depot/projects/vimage/src/sys/geom/bde/g_bde.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/bde/g_bde_work.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/eli/g_eli.c#5 integrate
.. //depot/projects/vimage/src/sys/geom/eli/g_eli_crypto.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/geom_io.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/journal/g_journal.c#6 integrate
.. //depot/projects/vimage/src/sys/geom/label/g_label_reiserfs.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/mirror/g_mirror.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/multipath/g_multipath.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part.c#5 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part.h#4 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_apm.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/part/g_part_gpt.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/raid3/g_raid3.c#3 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_drive.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_init.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_plex.c#2 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_volume.c#2 integrate
.. //depot/projects/vimage/src/sys/gnu/fs/ext2fs/ext2_vfsops.c#6 integrate
.. //depot/projects/vimage/src/sys/i386/bios/apm.c#3 edit
.. //depot/projects/vimage/src/sys/i386/conf/DEFAULTS#6 integrate
.. //depot/projects/vimage/src/sys/i386/conf/GENERIC#13 integrate
.. //depot/projects/vimage/src/sys/i386/conf/NOTES#12 integrate
.. //depot/projects/vimage/src/sys/i386/conf/PAE#7 integrate
.. //depot/projects/vimage/src/sys/i386/conf/XBOX#5 integrate
.. //depot/projects/vimage/src/sys/i386/i386/busdma_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/i386/i386/genassym.c#6 integrate
.. //depot/projects/vimage/src/sys/i386/i386/in_cksum.c#2 integrate
.. //depot/projects/vimage/src/sys/i386/i386/intr_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/i386/i386/locore.s#3 integrate
.. //depot/projects/vimage/src/sys/i386/i386/machdep.c#9 integrate
.. //depot/projects/vimage/src/sys/i386/i386/mp_machdep.c#8 integrate
.. //depot/projects/vimage/src/sys/i386/i386/msi.c#5 integrate
.. //depot/projects/vimage/src/sys/i386/i386/pmap.c#10 integrate
.. //depot/projects/vimage/src/sys/i386/i386/trap.c#7 integrate
.. //depot/projects/vimage/src/sys/i386/i386/vm_machdep.c#6 integrate
.. //depot/projects/vimage/src/sys/i386/ibcs2/ibcs2_misc.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/ibcs2/imgact_coff.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/include/bootinfo.h#2 integrate
.. //depot/projects/vimage/src/sys/i386/include/clock.h#3 integrate
.. //depot/projects/vimage/src/sys/i386/include/in_cksum.h#2 integrate
.. //depot/projects/vimage/src/sys/i386/include/pc/bios.h#2 integrate
.. //depot/projects/vimage/src/sys/i386/include/pmap.h#4 integrate
.. //depot/projects/vimage/src/sys/i386/isa/clock.c#6 integrate
.. //depot/projects/vimage/src/sys/i386/isa/prof_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/linux/imgact_linux.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/linux/linux_machdep.c#9 integrate
.. //depot/projects/vimage/src/sys/i386/pci/pci_cfgreg.c#3 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/busdma_machdep.c#4 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/interrupt.c#6 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#9 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#7 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/trap.c#4 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/vm_machdep.c#3 integrate
.. //depot/projects/vimage/src/sys/ia64/include/atomic.h#3 integrate
.. //depot/projects/vimage/src/sys/kern/imgact_aout.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/imgact_elf.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/imgact_gzip.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/init_main.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/kern_acct.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_alq.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/kern_clock.c#13 integrate
.. //depot/projects/vimage/src/sys/kern/kern_cpu.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/kern_descrip.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_environment.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exit.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/kern_fork.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/kern_idle.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/kern_intr.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/kern_jail.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_kse.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_kthread.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/kern_ktrace.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/kern_linker.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/kern_lock.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/kern_mbuf.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_mutex.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_prot.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/kern_rmlock.c#1 branch
.. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/kern_shutdown.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sig.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/kern_switch.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sx.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/kern_synch.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sysctl.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thr.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/kern_thread.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_timeout.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/kern_umtx.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/link_elf.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/link_elf_obj.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/linker_if.m#2 integrate
.. //depot/projects/vimage/src/sys/kern/p1003_1b.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/subr_bus.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/subr_lock.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/subr_pcpu.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/subr_sleepqueue.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/subr_smp.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/subr_stack.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/subr_taskqueue.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/subr_trap.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/subr_turnstile.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/subr_witness.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/sys_generic.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/sys_pipe.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/sys_process.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/sys_socket.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/sysv_msg.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/sysv_sem.c#4 integrate
.. //depot/projects/vimage/src/sys/kern/sysv_shm.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/tty_pty.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_mbuf2.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_sem.c#3 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_socket.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_usrreq.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_acl.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_aio.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_bio.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_cache.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_extattr.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_lookup.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_mount.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_syscalls.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_vnops.c#6 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#14 integrate
.. //depot/projects/vimage/src/sys/modules/agp/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/asmc/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/geom/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/nvram/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/nxge/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/wpi/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/wpifw/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/zfs/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/net/bpf.c#16 integrate
.. //depot/projects/vimage/src/sys/net/bpf.h#3 integrate
.. //depot/projects/vimage/src/sys/net/bsd_comp.c#2 integrate
.. //depot/projects/vimage/src/sys/net/ieee8023ad_lacp.c#7 integrate
.. //depot/projects/vimage/src/sys/net/if.c#23 integrate
.. //depot/projects/vimage/src/sys/net/if_atmsubr.c#3 integrate
.. //depot/projects/vimage/src/sys/net/if_bridge.c#9 integrate
.. //depot/projects/vimage/src/sys/net/if_bridgevar.h#6 integrate
.. //depot/projects/vimage/src/sys/net/if_disc.c#3 integrate
.. //depot/projects/vimage/src/sys/net/if_enc.c#3 integrate
.. //depot/projects/vimage/src/sys/net/if_ethersubr.c#18 integrate
.. //depot/projects/vimage/src/sys/net/if_fddisubr.c#2 integrate
.. //depot/projects/vimage/src/sys/net/if_fwsubr.c#4 integrate
.. //depot/projects/vimage/src/sys/net/if_gif.c#12 integrate
.. //depot/projects/vimage/src/sys/net/if_iso88025subr.c#2 integrate
.. //depot/projects/vimage/src/sys/net/if_lagg.c#12 integrate
.. //depot/projects/vimage/src/sys/net/if_loop.c#18 edit
.. //depot/projects/vimage/src/sys/net/if_ppp.c#7 integrate
.. //depot/projects/vimage/src/sys/net/if_stf.c#7 integrate
.. //depot/projects/vimage/src/sys/net/if_tun.c#4 integrate
.. //depot/projects/vimage/src/sys/net/pfil.c#2 integrate
.. //depot/projects/vimage/src/sys/net/pfil.h#3 integrate
.. //depot/projects/vimage/src/sys/net/route.c#11 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.c#9 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.h#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.c#6 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#7 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.c#4 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ht.h#3 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_input.c#8 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#6 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.h#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#8 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.h#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#8 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#8 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#7 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#3 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_ap.c#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan_sta.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#8 integrate
.. //depot/projects/vimage/src/sys/netatalk/aarp.c#3 integrate
.. //depot/projects/vimage/src/sys/netatalk/ddp_input.c#3 integrate
.. //depot/projects/vimage/src/sys/netatalk/ddp_output.c#3 integrate
.. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate
.. //depot/projects/vimage/src/sys/netgraph/bluetooth/socket/ng_btsocket_rfcomm.c#4 integrate
.. //depot/projects/vimage/src/sys/netgraph/netgraph.h#6 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_base.c#23 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_cisco.c#3 integrate
.. //depot/projects/vimage/src/sys/netgraph/ng_gif.c#3 edit
.. //depot/projects/vimage/src/sys/netinet/if_ether.c#15 integrate
.. //depot/projects/vimage/src/sys/netinet/igmp.c#12 integrate
.. //depot/projects/vimage/src/sys/netinet/in_pcb.c#18 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_divert.c#8 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_dummynet.h#3 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw2.c#28 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw_pfil.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_icmp.c#10 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_input.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_options.c#7 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_output.c#12 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias_util.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/raw_ip.c#17 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_bsd_addr.c#10 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#19 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#21 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#21 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#21 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#14 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.h#14 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_input.c#25 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_output.c#14 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#37 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_syncache.c#23 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_timewait.c#12 integrate
.. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_mroute.c#11 edit
.. //depot/projects/vimage/src/sys/netinet6/ip6_output.c#12 integrate
.. //depot/projects/vimage/src/sys/netinet6/nd6.c#23 integrate
.. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#19 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec.c#17 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec.h#5 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#11 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#10 integrate
.. //depot/projects/vimage/src/sys/netipsec/keysock.c#8 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform.h#2 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#12 integrate
.. //depot/projects/vimage/src/sys/netsmb/smb_iod.c#2 integrate
.. //depot/projects/vimage/src/sys/nfs4client/nfs4_vfsops.c#4 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_nfsiod.c#3 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vfsops.c#10 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#9 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs.h#3 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsock.c#5 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_srvsubs.c#6 integrate
.. //depot/projects/vimage/src/sys/opencrypto/crypto.c#3 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#7 integrate
.. //depot/projects/vimage/src/sys/pc98/pc98/machdep.c#7 integrate
.. //depot/projects/vimage/src/sys/pci/agp.c#3 delete
.. //depot/projects/vimage/src/sys/pci/agp_ali.c#2 delete
.. //depot/projects/vimage/src/sys/pci/agp_amd.c#2 delete
.. //depot/projects/vimage/src/sys/pci/agp_amd64.c#2 delete
.. //depot/projects/vimage/src/sys/pci/agp_ati.c#2 delete
.. //depot/projects/vimage/src/sys/pci/agp_i810.c#4 delete
.. //depot/projects/vimage/src/sys/pci/agp_if.m#2 delete
.. //depot/projects/vimage/src/sys/pci/agp_intel.c#3 delete
.. //depot/projects/vimage/src/sys/pci/agp_nvidia.c#2 delete
.. //depot/projects/vimage/src/sys/pci/agp_sis.c#2 delete
.. //depot/projects/vimage/src/sys/pci/agp_via.c#3 delete
.. //depot/projects/vimage/src/sys/pci/agppriv.h#3 delete
.. //depot/projects/vimage/src/sys/pci/agpreg.h#4 delete
.. //depot/projects/vimage/src/sys/pci/agpvar.h#2 delete
.. //depot/projects/vimage/src/sys/pci/if_rl.c#7 integrate
.. //depot/projects/vimage/src/sys/pci/if_rlreg.h#7 integrate
.. //depot/projects/vimage/src/sys/pci/if_sf.c#3 integrate
.. //depot/projects/vimage/src/sys/pci/if_ste.c#4 integrate
.. //depot/projects/vimage/src/sys/pci/if_vr.c#6 integrate
.. //depot/projects/vimage/src/sys/pci/if_xl.c#6 integrate
.. //depot/projects/vimage/src/sys/pci/nfsmb.c#3 integrate
.. //depot/projects/vimage/src/sys/pci/xrpu.c#2 delete
.. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/atomic.h#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/include/md_var.h#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/clock.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/genassym.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/intr_machdep.c#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/machdep.c#7 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_if.m#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_oea.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/swtch.S#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/trap.c#6 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/vm_machdep.c#4 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit.c#7 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit.h#5 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm.c#5 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_bsm_klib.c#5 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_pipe.c#4 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_syscalls.c#8 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_worker.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_atalk.c#1 branch
.. //depot/projects/vimage/src/sys/security/mac/mac_audit.c#3 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_framework.h#7 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#6 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_inet6.c#1 branch
.. //depot/projects/vimage/src/sys/security/mac/mac_internal.h#5 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_net.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_pipe.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_policy.h#8 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_posix_sem.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_process.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_socket.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_syscalls.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_system.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_sysv_msg.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_sysv_sem.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_sysv_shm.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_vfs.c#7 integrate
.. //depot/projects/vimage/src/sys/security/mac_biba/mac_biba.c#6 integrate
.. //depot/projects/vimage/src/sys/security/mac_bsdextended/mac_bsdextended.c#8 integrate
.. //depot/projects/vimage/src/sys/security/mac_ifoff/mac_ifoff.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac_lomac/mac_lomac.c#7 integrate
.. //depot/projects/vimage/src/sys/security/mac_mls/mac_mls.c#7 integrate
.. //depot/projects/vimage/src/sys/security/mac_none/mac_none.c#4 integrate
.. //depot/projects/vimage/src/sys/security/mac_partition/mac_partition.c#5 integrate
.. //depot/projects/vimage/src/sys/security/mac_portacl/mac_portacl.c#6 integrate
.. //depot/projects/vimage/src/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate
.. //depot/projects/vimage/src/sys/security/mac_stub/mac_stub.c#8 integrate
.. //depot/projects/vimage/src/sys/security/mac_test/mac_test.c#7 integrate
.. //depot/projects/vimage/src/sys/sparc64/conf/DEFAULTS#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#6 integrate
.. //depot/projects/vimage/src/sys/sparc64/isa/isa.c#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/ofw_pcibus.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/psycho.c#9 integrate
.. //depot/projects/vimage/src/sys/sparc64/pci/psychovar.h#4 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/intr_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/machdep.c#7 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#6 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/vm_machdep.c#4 integrate
.. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#7 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/pcpu.h#6 integrate
.. //depot/projects/vimage/src/sys/sun4v/include/stdarg.h#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#7 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/simdisk.c#2 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/trap.c#5 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/vm_machdep.c#5 integrate
.. //depot/projects/vimage/src/sys/sys/_elf_solaris.h#2 delete
.. //depot/projects/vimage/src/sys/sys/_rmlock.h#1 branch
.. //depot/projects/vimage/src/sys/sys/apm.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/callout.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/elf.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/elf_common.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/eventhandler.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/gpt.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/kernel.h#8 integrate
.. //depot/projects/vimage/src/sys/sys/kthread.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/linker.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/lock.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/lockmgr.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/malloc.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/mutex.h#9 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#13 integrate
.. //depot/projects/vimage/src/sys/sys/pciio.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/pcpu.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/priv.h#6 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#14 integrate
.. //depot/projects/vimage/src/sys/sys/resource.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/rmlock.h#1 branch
.. //depot/projects/vimage/src/sys/sys/signal.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/signalvar.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/smp.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/stack.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/stat.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/sysctl.h#13 integrate
.. //depot/projects/vimage/src/sys/sys/time.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/types.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/umtx.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/user.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/vimage.h#52 edit
.. //depot/projects/vimage/src/sys/sys/xrpuio.h#2 delete
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_alloc.c#6 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_balloc.c#2 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_inode.c#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_snapshot.c#6 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_softdep.c#6 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#5 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vnops.c#7 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_bmap.c#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_vnops.c#5 integrate
.. //depot/projects/vimage/src/sys/vm/phys_pager.c#6 integrate
.. //depot/projects/vimage/src/sys/vm/pmap.h#2 integrate
.. //depot/projects/vimage/src/sys/vm/redzone.c#2 integrate
.. //depot/projects/vimage/src/sys/vm/swap_pager.c#9 integrate
.. //depot/projects/vimage/src/sys/vm/vm_contig.c#7 integrate
.. //depot/projects/vimage/src/sys/vm/vm_extern.h#2 integrate
.. //depot/projects/vimage/src/sys/vm/vm_glue.c#7 integrate
.. //depot/projects/vimage/src/sys/vm/vm_kern.c#5 integrate
.. //depot/projects/vimage/src/sys/vm/vm_map.c#8 integrate
.. //depot/projects/vimage/src/sys/vm/vm_map.h#3 integrate
.. //depot/projects/vimage/src/sys/vm/vm_mmap.c#7 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#10 integrate
.. //depot/projects/vimage/src/sys/vm/vm_page.c#12 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pageout.c#8 integrate
.. //depot/projects/vimage/src/sys/vm/vm_pageout.h#2 integrate
.. //depot/projects/vimage/src/sys/vm/vm_zeroidle.c#7 integrate
.. //depot/projects/vimage/src/sys/vm/vnode_pager.c#5 integrate
Differences ...
==== //depot/projects/vimage/src/sys/amd64/amd64/busdma_machdep.c#5 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.83 2007/06/17 04:21:58 mjacob Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.84 2007/11/27 17:28:11 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -580,7 +580,6 @@
bus_addr_t curaddr, lastaddr, baddr, bmask;
vm_offset_t vaddr;
bus_addr_t paddr;
- int needbounce = 0;
int seg;
if (map == NULL)
@@ -604,10 +603,8 @@
while (vaddr < vendaddr) {
paddr = pmap_kextract(vaddr);
- if (run_filter(dmat, paddr) != 0) {
- needbounce = 1;
+ if (run_filter(dmat, paddr) != 0)
map->pagesneeded++;
- }
vaddr += PAGE_SIZE;
}
CTR1(KTR_BUSDMA, "pagesneeded= %d\n", map->pagesneeded);
@@ -679,7 +676,7 @@
segs[seg].ds_len = sgsize;
first = 0;
} else {
- if (needbounce == 0 && curaddr == lastaddr &&
+ if (curaddr == lastaddr &&
(segs[seg].ds_len + sgsize) <= dmat->maxsegsz &&
(dmat->boundary == 0 ||
(segs[seg].ds_addr & bmask) == (curaddr & bmask)))
==== //depot/projects/vimage/src/sys/amd64/amd64/db_trace.c#2 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.80 2006/11/17 20:27:00 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/db_trace.c,v 1.81 2007/11/15 22:00:56 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -317,7 +317,8 @@
if (name != NULL) {
if (strcmp(name, "calltrap") == 0 ||
strcmp(name, "fork_trampoline") == 0 ||
- strcmp(name, "nmi_calltrap") == 0)
+ strcmp(name, "nmi_calltrap") == 0 ||
+ strcmp(name, "Xdblfault") == 0)
frame_type = TRAP;
else if (strncmp(name, "Xatpic_intr", 11) == 0 ||
strncmp(name, "Xapic_isr", 9) == 0 ||
==== //depot/projects/vimage/src/sys/amd64/amd64/exception.S#3 (text+ko) ====
@@ -27,7 +27,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.129 2006/12/23 03:30:50 davidxu Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.130 2007/11/15 22:00:56 jhb Exp $
*/
#include "opt_atpic.h"
@@ -187,10 +187,28 @@
IDTVEC(dblfault)
subq $TF_ERR,%rsp
movq $T_DOUBLEFLT,TF_TRAPNO(%rsp)
+ movq $0,TF_ADDR(%rsp)
+ movq $0,TF_ERR(%rsp)
+ movq %rdi,TF_RDI(%rsp)
+ movq %rsi,TF_RSI(%rsp)
+ movq %rdx,TF_RDX(%rsp)
+ movq %rcx,TF_RCX(%rsp)
+ movq %r8,TF_R8(%rsp)
+ movq %r9,TF_R9(%rsp)
+ movq %rax,TF_RAX(%rsp)
+ movq %rbx,TF_RBX(%rsp)
+ movq %rbp,TF_RBP(%rsp)
+ movq %r10,TF_R10(%rsp)
+ movq %r11,TF_R11(%rsp)
+ movq %r12,TF_R12(%rsp)
+ movq %r13,TF_R13(%rsp)
+ movq %r14,TF_R14(%rsp)
+ movq %r15,TF_R15(%rsp)
testb $SEL_RPL_MASK,TF_CS(%rsp) /* Did we come from kernel? */
jz 1f /* already running with kernel GS.base */
swapgs
-1: call dblfault_handler
+1: movq %rsp, %rdi
+ call dblfault_handler
2: hlt
jmp 2b
==== //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#6 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.165 2007/09/17 21:55:28 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.166 2007/11/23 03:03:29 jkoshy Exp $");
#include "opt_compat.h"
#include "opt_kstack_pages.h"
@@ -78,12 +78,15 @@
ASSYM(TD_LOCK, offsetof(struct thread, td_lock));
ASSYM(TD_FLAGS, offsetof(struct thread, td_flags));
ASSYM(TD_PCB, offsetof(struct thread, td_pcb));
+ASSYM(TD_PFLAGS, offsetof(struct thread, td_pflags));
ASSYM(TD_PROC, offsetof(struct thread, td_proc));
ASSYM(TD_TID, offsetof(struct thread, td_tid));
ASSYM(TDF_ASTPENDING, TDF_ASTPENDING);
ASSYM(TDF_NEEDRESCHED, TDF_NEEDRESCHED);
+ASSYM(TDP_CALLCHAIN, TDP_CALLCHAIN);
+
ASSYM(V_TRAP, offsetof(struct vmmeter, v_trap));
ASSYM(V_SYSCALL, offsetof(struct vmmeter, v_syscall));
ASSYM(V_INTR, offsetof(struct vmmeter, v_intr));
==== //depot/projects/vimage/src/sys/amd64/amd64/intr_machdep.c#6 (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.34 2007/06/04 21:38:44 attilio Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.35 2007/11/21 04:03:50 scottl Exp $
*/
/*
@@ -390,13 +390,13 @@
isrc->is_pic->pic_disable_source(isrc, PIC_EOI);
else
isrc->is_pic->pic_eoi_source(isrc);
- critical_exit();
/* Schedule the ithread if needed. */
if (thread) {
error = intr_event_schedule_thread(ie);
KASSERT(error == 0, ("bad stray interrupt"));
}
+ critical_exit();
td->td_intr_nesting_level--;
}
#endif
==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#8 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.42 2007/09/11 22:54:08 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.43 2007/10/27 13:34:53 jhb Exp $");
#include "opt_hwpmc_hooks.h"
@@ -1007,10 +1007,6 @@
struct apic_enumerator *enumerator;
int retval, best;
- /* We only support built in local APICs. */
- if (!(cpu_feature & CPUID_APIC))
- return;
-
/* Don't probe if APIC mode is disabled. */
if (resource_disabled("apic", 0))
return;
==== //depot/projects/vimage/src/sys/amd64/amd64/machdep.c#7 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.675 2007/06/06 07:35:07 davidxu Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.678 2007/11/15 22:00:57 jhb Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -138,7 +138,6 @@
CTASSERT(offsetof(struct pcpu, pc_curthread) == 0);
extern u_int64_t hammer_time(u_int64_t, u_int64_t);
-extern void dblfault_handler(void);
extern void printcpuinfo(void); /* XXX header file */
extern void identify_cpu(void);
@@ -881,7 +880,7 @@
printf("SMAP type=%02x base=%016lx len=%016lx\n",
smap->type, smap->base, smap->length);
- if (smap->type != 0x01)
+ if (smap->type != SMAP_TYPE_MEMORY)
continue;
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list