Date: Tue, 18 Dec 2007 22:14:12 GMT From: Robert Watson <rwatson@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 131185 for review Message-ID: <200712182214.lBIMECx6062112@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=131185 Change 131185 by rwatson@rwatson_cinnamon on 2007/12/18 22:14:10 Integ zcopybpf. Affected files ... .. //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/busdma_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/db_trace.c#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/exception.S#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/genassym.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/intr_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/pmap.c#10 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/prof_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/stack_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/amd64/trap.c#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/amd64/vm_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/GENERIC#10 integrate .. //depot/projects/zcopybpf/src/sys/amd64/conf/NOTES#8 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/pci_cfgreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/pmc_mdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/specialreg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/amd64/include/stack.h#1 branch .. //depot/projects/zcopybpf/src/sys/amd64/pci/pci_cfgreg.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/busdma_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/cpufunc.c#6 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/nexus_io.c#2 delete .. //depot/projects/zcopybpf/src/sys/arm/arm/nexus_io_asm.S#2 delete .. //depot/projects/zcopybpf/src/sys/arm/arm/pmap.c#8 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/stack_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/arm/arm/trap.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/arm/vm_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/at91.c#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/at91/if_ate.c#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/AVILA#5 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/BWCT#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/CRB#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/EP80219#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/HL200#1 branch .. //depot/projects/zcopybpf/src/sys/arm/conf/IQ31244#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/KB920X#4 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/SIMICS#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/conf/SKYEYE#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/asmacros.h#3 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/atomic.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/pmc_mdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/arm/include/stack.h#1 branch .. //depot/projects/zcopybpf/src/sys/arm/sa11x0/files.sa11x0#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/cdboot/cdboot.s#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/gptboot/gptldr.S#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/libi386/biosdisk.c#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/i386/pmbr/pmbr.s#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/pc98/cdboot/cdboot.s#3 integrate .. //depot/projects/zcopybpf/src/sys/boot/powerpc/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/boot/powerpc/loader/Makefile#2 delete .. //depot/projects/zcopybpf/src/sys/boot/powerpc/loader/conf.c#2 delete .. //depot/projects/zcopybpf/src/sys/boot/powerpc/loader/help.ofw#2 delete .. //depot/projects/zcopybpf/src/sys/boot/powerpc/loader/ldscript.powerpc#2 delete .. //depot/projects/zcopybpf/src/sys/boot/powerpc/loader/metadata.c#2 delete .. //depot/projects/zcopybpf/src/sys/boot/powerpc/loader/start.c#2 delete .. //depot/projects/zcopybpf/src/sys/boot/powerpc/loader/version#2 delete .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/conf.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/help.ofw#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/ldscript.powerpc#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/metadata.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/start.c#1 branch .. //depot/projects/zcopybpf/src/sys/boot/powerpc/ofw/version#1 branch .. //depot/projects/zcopybpf/src/sys/cam/cam_xpt.c#8 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_all.h#3 integrate .. //depot/projects/zcopybpf/src/sys/cam/scsi/scsi_da.c#7 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_ipc.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_misc.c#5 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_proto.h#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscall.h#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_syscalls.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/freebsd32_sysent.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/freebsd32/syscalls.master#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/linprocfs/linprocfs.c#9 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/ndis_var.h#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/ntoskrnl_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/ndis/subr_ntoskrnl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/rpc/xdr.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/atomic.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/bitmap.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cpupart.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cpuvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/cyclic.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/elf.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/kmem.h#3 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/mman.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/modctl.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/objfs.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/param.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/pcpu.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/proc.h#4 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/stat.h#1 branch .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/time.h#2 integrate .. //depot/projects/zcopybpf/src/sys/compat/opensolaris/sys/types.h#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/Makefile.amd64#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/NOTES#12 integrate .. //depot/projects/zcopybpf/src/sys/conf/files#14 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.amd64#7 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.arm#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.i386#7 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.ia64#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.pc98#5 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.powerpc#6 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.sparc64#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/files.sun4v#4 integrate .. //depot/projects/zcopybpf/src/sys/conf/kmod.mk#6 integrate .. //depot/projects/zcopybpf/src/sys/conf/options#10 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.amd64#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.i386#3 integrate .. //depot/projects/zcopybpf/src/sys/conf/options.powerpc#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/fil.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_auth.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/ipfilter/netinet/ip_fil_freebsd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/avl/avl.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/common/nvpair/nvpair.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/arc.c#6 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/sys/spa.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_cache.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/vdev_queue.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zil.c#3 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/fs/zfs/zio.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/rpc/xdr.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/byteorder.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/procset.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/sysmacros.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/opensolaris/uts/common/sys/vmem.h#2 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf.c#5 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_if.c#4 integrate .. //depot/projects/zcopybpf/src/sys/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_cam.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_debug.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aac_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aacreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/aac/aacvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/acpica/acpi_battery.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/agp/agp.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_ali.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_amd.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_amd64.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_ati.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_i810.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_if.m#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_intel.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_nvidia.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_sis.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agp_via.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agppriv.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agpreg.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/agp/agpvar.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/amr/amr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/amr/amr_cam.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/amr/amr_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/amr/amrvar.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/an/if_an.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/arcmsr/arcmsr.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/arcmsr/arcmsr.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/asmc/asmc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-all.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-chipset.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-disk.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-dma.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-lowlevel.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/ata-pci.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-cd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-fd.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ata/atapi-tape.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/bce/if_bce.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/bfe/if_bfe.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/bge/if_bge.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/common/cxgb_t3_cpl.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_adapter.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_config.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_include.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_l2t.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_l2t.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_main.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_offload.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_osdep.h#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/cxgb_sge.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/cxgb_support.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mbufq.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/mvec.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/sys/uipc_mvec.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/cxgb/t3cdev.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/toecore/cxgb_toedev.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/toecore/toedev.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/toecore/toedev.h#2 delete .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_cpl_socket.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_defs.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_listen.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_t3_ddp.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tcp.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_subr.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tcp_usrreq.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_toepcb.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tom.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tom.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/cxgb/ulp/tom/cxgb_tom_sysctl.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/dc/dcphy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/dc/if_dc.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/drm/drmP.h#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/drm/drm_agpsupport.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_80003es2lan.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_80003es2lan.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82540.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82541.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82541.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82542.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82543.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82543.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82571.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82575.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_82575.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_api.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_defines.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_hw.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_ich8lan.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_mac.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_manage.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_manage.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_nvm.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_osdep.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_phy.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/e1000_regs.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/em/if_em.h#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/esp/esp_sbus.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hptrr/amd64-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/array.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/him.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/himfuncs.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptintf.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptrr_config.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptrr_config.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptrr_os_bsd.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/hptrr_osm_bsd.c#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/i386-elf.hptrr_lib.o.uu#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/ldm.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/list.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/os_bsd.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hptrr/osm.h#1 branch .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_amd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_arm.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_ia64.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_logging.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_mod.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_piv.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_powerpc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_ppro.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_sparc64.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/hwpmc/hwpmc_x86.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ichsmb/ichsmb_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/ichwd/ichwd.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndis_pci.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/if_ndis/if_ndisvar.h#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/ipw/if_ipw.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/iwi/if_iwi.c#7 integrate .. //depot/projects/zcopybpf/src/sys/dev/lge/if_lge.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/amphy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/e1000phy.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/nsphy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/rlphy.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/tdkphy.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/mii/ukphy_subr.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/msk/if_msk.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/msk/if_mskreg.h#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/nfe/if_nfe.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/nge/if_nge.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/nve/if_nve.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/pci/pci.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/random/yarrow.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/re/if_re.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/si/si_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/sio/sio.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sio/sio_isa.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sio/sio_puc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/sk/if_sk.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/snp/snp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/hda/hdac.c#10 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/ich.c#8 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pci/maestro.c#6 integrate .. //depot/projects/zcopybpf/src/sys/dev/sound/pcm/channel.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/stge/if_stge.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/ti/if_ti.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/txp/if_txp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/ehci_pci.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_rum.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/if_zyd.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uhci_pci.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/umass.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/uplcom.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usb_quirks.c#5 integrate .. //depot/projects/zcopybpf/src/sys/dev/usb/usbdevs#12 integrate .. //depot/projects/zcopybpf/src/sys/dev/utopia/utopia.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/zcopybpf/src/sys/dev/vx/if_vx_pci.c#3 integrate .. //depot/projects/zcopybpf/src/sys/dev/wpi/if_wpi.c#2 integrate .. //depot/projects/zcopybpf/src/sys/dev/wpi/if_wpireg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/msdosfs/msdosfs_vfsops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/zcopybpf/src/sys/fs/ntfs/ntfs_vfsops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs.h#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_subr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vfsops.c#4 integrate .. //depot/projects/zcopybpf/src/sys/fs/tmpfs/tmpfs_vnops.c#3 integrate .. //depot/projects/zcopybpf/src/sys/fs/udf/udf_vfsops.c#5 integrate .. //depot/projects/zcopybpf/src/sys/geom/eli/g_eli_crypto.c#4 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_bsd.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_bsd_enc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_dev.c#5 integrate .. //depot/projects/zcopybpf/src/sys/geom/geom_io.c#5 integrate .. //depot/projects/zcopybpf/src/sys/geom/label/g_label_reiserfs.c#2 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.c#6 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part.h#5 integrate .. //depot/projects/zcopybpf/src/sys/geom/part/g_part_bsd.c#1 branch .. //depot/projects/zcopybpf/src/sys/i386/bios/apm.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/GENERIC#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/NOTES#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/PAE#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/conf/XBOX#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/busdma_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/db_trace.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/exception.s#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/genassym.c#5 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/intr_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/locore.s#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/machdep.c#7 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/mp_machdep.c#8 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/pmap.c#10 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/stack_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/i386/i386/trap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/i386/vm_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pmap.h#4 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/pmc_mdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/i386/include/stack.h#1 branch .. //depot/projects/zcopybpf/src/sys/i386/isa/prof_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/i386/linux/linux_machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/i386/pci/pci_cfgreg.c#2 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/DEFAULTS#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/conf/GENERIC#6 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/busdma_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/db_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/interrupt.c#5 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/pmap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/stack_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/ia64/ia64/trap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/atomic.h#3 integrate .. //depot/projects/zcopybpf/src/sys/ia64/include/pmc_mdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/Makefile#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/imgact_elf.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/init_main.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_clock.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_conf.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_descrip.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_event.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_exec.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_fork.c#9 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_kse.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_kthread.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_ktrace.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_linker.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_lock.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mbuf.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mib.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_module.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_mutex.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_pmc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_proc.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_resource.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_rmlock.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_rwlock.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sig.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_switch.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sx.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_synch.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_sysctl.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_thread.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_timeout.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/kern_umtx.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/linker_if.m#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/p1003_1b.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_4bsd.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/sched_ule.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_bus.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_lock.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_pcpu.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_sleepqueue.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_stack.c#2 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_trap.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_turnstile.c#3 integrate .. //depot/projects/zcopybpf/src/sys/kern/subr_witness.c#7 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_generic.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/sys_pipe.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/tty_pty.c#4 integrate .. //depot/projects/zcopybpf/src/sys/kern/uipc_sockbuf.c#6 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_bio.c#8 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_cache.c#5 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_mount.c#10 integrate .. //depot/projects/zcopybpf/src/sys/kern/vfs_subr.c#8 integrate .. //depot/projects/zcopybpf/src/sys/modules/Makefile#12 integrate .. //depot/projects/zcopybpf/src/sys/modules/agp/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/amr/Makefile#2 integrate .. //depot/projects/zcopybpf/src/sys/modules/cxgb/Makefile#6 integrate .. //depot/projects/zcopybpf/src/sys/modules/cxgb/cxgb/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/cxgb/toecore/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/cxgb/tom/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/hptrr/Makefile#1 branch .. //depot/projects/zcopybpf/src/sys/modules/zfs/Makefile#5 integrate .. //depot/projects/zcopybpf/src/sys/net/bridgestp.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net/bridgestp.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net/ieee8023ad_lacp.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net/if.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net/if_bridge.c#9 integrate .. //depot/projects/zcopybpf/src/sys/net/if_enc.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/if_lagg.c#7 integrate .. //depot/projects/zcopybpf/src/sys/net/if_var.h#6 integrate .. //depot/projects/zcopybpf/src/sys/net/pfil.c#2 integrate .. //depot/projects/zcopybpf/src/sys/net/pfil.h#3 integrate .. //depot/projects/zcopybpf/src/sys/net/route.c#4 integrate .. //depot/projects/zcopybpf/src/sys/net/route.h#2 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211.h#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_ht.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_node.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_output.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_proto.c#6 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_radiotap.h#4 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_scan_sta.c#5 integrate .. //depot/projects/zcopybpf/src/sys/net80211/ieee80211_var.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netatalk/aarp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netatalk/ddp_output.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/netgraph.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_base.c#6 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_cisco.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netgraph/ng_l2tp.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet/if_ether.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/if_ether.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/in_pcb.h#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_dummynet.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_fw2.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/ip_input.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet/libalias/alias_util.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp.h#8 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_bsd_addr.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_output.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_structs.h#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctp_usrreq.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/sctputil.c#12 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_offload.c#1 branch .. //depot/projects/zcopybpf/src/sys/netinet/tcp_offload.h#1 branch .. //depot/projects/zcopybpf/src/sys/netinet/tcp_output.c#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_subr.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_syncache.c#11 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_syncache.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet/tcp_var.h#10 integrate .. //depot/projects/zcopybpf/src/sys/netinet/toedev.h#1 branch .. //depot/projects/zcopybpf/src/sys/netinet6/dest6.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/frag6.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/icmp6.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_cksum.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_gif.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_gif.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_ifattach.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_ifattach.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_pcb.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_pcb.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_proto.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_rmx.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_src.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/in6_var.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_ecn.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_forward.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_id.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_input.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_ipsec.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_ipsec.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_mroute.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_mroute.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_output.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6_var.h#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/ip6protosw.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/mld6.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/mld6_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/nd6.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/nd6.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/nd6_nbr.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/nd6_rtr.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/pim6.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/pim6_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/raw_ip6.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/raw_ip6.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/route6.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/scope6.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/scope6_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/sctp6_usrreq.c#9 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/sctp6_var.h#6 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/tcp6_var.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/udp6_usrreq.c#7 integrate .. //depot/projects/zcopybpf/src/sys/netinet6/udp6_var.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec.h#3 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec_input.c#5 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/ipsec_output.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/keysock.c#3 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/xform.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netipsec/xform_ipip.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netncp/ncp_rq.c#2 integrate .. //depot/projects/zcopybpf/src/sys/netncp/ncp_sock.c#4 integrate .. //depot/projects/zcopybpf/src/sys/netncp/ncp_sock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/netsmb/smb_trantcp.c#3 integrate .. //depot/projects/zcopybpf/src/sys/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/zcopybpf/src/sys/pc98/conf/GENERIC#8 integrate .. //depot/projects/zcopybpf/src/sys/pc98/include/stack.h#1 branch .. //depot/projects/zcopybpf/src/sys/pc98/pc98/machdep.c#6 integrate .. //depot/projects/zcopybpf/src/sys/pci/agp.c#4 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_ali.c#3 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_amd.c#3 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_amd64.c#3 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_ati.c#3 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_i810.c#5 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_if.m#2 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_intel.c#3 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_nvidia.c#3 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_sis.c#3 delete .. //depot/projects/zcopybpf/src/sys/pci/agp_via.c#4 delete .. //depot/projects/zcopybpf/src/sys/pci/agppriv.h#4 delete .. //depot/projects/zcopybpf/src/sys/pci/agpreg.h#3 delete .. //depot/projects/zcopybpf/src/sys/pci/agpvar.h#2 delete .. //depot/projects/zcopybpf/src/sys/pci/if_rl.c#4 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_rlreg.h#5 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_sf.c#3 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_ste.c#5 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_vr.c#5 integrate .. //depot/projects/zcopybpf/src/sys/pci/if_xl.c#5 integrate .. //depot/projects/zcopybpf/src/sys/pci/nfsmb.c#2 integrate .. //depot/projects/zcopybpf/src/sys/pci/xrpu.c#2 delete .. //depot/projects/zcopybpf/src/sys/powerpc/aim/clock.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/copyinout.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/interrupt.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/locore.S#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/mmu_oea.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/nexus.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/ofw_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/ofwmagic.S#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/swtch.S#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/trap.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/trap_subr.S#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/uio_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/uma_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/aim/vm_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/conf/GENERIC#8 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/conf/NOTES#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/atomic.h#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/fpu.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/md_var.h#4 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/pmc_mdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/include/stack.h#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/clock.c#3 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/copyinout.c#2 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/db_memrw.c#2 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/db_trace.c#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/interrupt.c#3 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/intr_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/locore.S#2 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/machdep.c#5 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/mmu_if.m#2 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/mmu_oea.c#2 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/nexus.c#5 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/ofw_machdep.c#2 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/ofwmagic.S#2 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/pmap_dispatch.c#3 integrate .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/stack_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/swtch.S#3 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/trap.c#5 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/trap_subr.S#2 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/uio_machdep.c#3 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/uma_machdep.c#3 delete .. //depot/projects/zcopybpf/src/sys/powerpc/powerpc/vm_machdep.c#4 delete .. //depot/projects/zcopybpf/src/sys/security/audit/audit.c#6 integrate .. //depot/projects/zcopybpf/src/sys/security/mac/mac_posix_sem.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/conf/DEFAULTS#3 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/conf/GENERIC#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/pmc_mdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/include/stack.h#1 branch .. //depot/projects/zcopybpf/src/sys/sparc64/pci/ofw_pcibus.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/pci/psycho.c#7 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/pci/psychovar.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/db_trace.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/intr_machdep.c#5 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/pmap.c#6 integrate .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/stack_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/sparc64/sparc64/vm_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/conf/GENERIC#6 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/pcpu.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/pmc_mdep.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/include/stack.h#1 branch .. //depot/projects/zcopybpf/src/sys/sun4v/include/stdarg.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/db_trace.c#2 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/pmap.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/stack_machdep.c#1 branch .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/trap.c#3 integrate .. //depot/projects/zcopybpf/src/sys/sun4v/sun4v/vm_machdep.c#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/_elf_solaris.h#2 delete .. //depot/projects/zcopybpf/src/sys/sys/_lock.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/ata.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/callout.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/cdefs.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/disklabel.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/elf.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/elf_common.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/eventhandler.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/kernel.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/kerneldump.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/linker.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/lock.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/lock_profile.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/lockmgr.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/malloc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/mutex.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/param.h#10 integrate .. //depot/projects/zcopybpf/src/sys/sys/pcpu.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/pmc.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/pmckern.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/pmclog.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/proc.h#10 integrate .. //depot/projects/zcopybpf/src/sys/sys/resource.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/selinfo.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/signal.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/socket.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/socketvar.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/stack.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/stat.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/sx.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/sysctl.h#5 integrate .. //depot/projects/zcopybpf/src/sys/sys/systm.h#7 integrate .. //depot/projects/zcopybpf/src/sys/sys/time.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/tty.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/types.h#2 integrate .. //depot/projects/zcopybpf/src/sys/sys/ucred.h#4 integrate .. //depot/projects/zcopybpf/src/sys/sys/umtx.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/user.h#3 integrate .. //depot/projects/zcopybpf/src/sys/sys/xrpuio.h#2 delete .. //depot/projects/zcopybpf/src/sys/ufs/ffs/ffs_alloc.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/pmap.h#3 integrate .. //depot/projects/zcopybpf/src/sys/vm/redzone.c#2 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_contig.c#6 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_object.c#7 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_page.c#9 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_pageout.c#5 integrate .. //depot/projects/zcopybpf/src/sys/vm/vm_pageout.h#2 integrate .. //depot/projects/zcopybpf/src/sys/vm/vnode_pager.c#5 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/Makefile#4 integrate .. //depot/projects/zcopybpf/src/usr.sbin/netstat/inet.c#6 integrate Differences ... ==== //depot/projects/zcopybpf/src/contrib/tcpdump/tcpdump.c#3 (text+ko) ==== @@ -33,7 +33,7 @@ "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.253.2.13 2007/09/12 19:48:51 guy Exp $ (LBL)"; #endif -/* $FreeBSD: src/contrib/tcpdump/tcpdump.c,v 1.12 2007/10/16 02:31:48 mlaier Exp $ */ +/* $FreeBSD: src/contrib/tcpdump/tcpdump.c,v 1.13 2007/11/21 12:52:26 mlaier Exp $ */ /* * tcpdump - monitor tcp/ip traffic on an ethernet. @@ -1132,6 +1132,7 @@ if (pcap_stats(pd, &stat) < 0) { (void)fprintf(stderr, "pcap_stats: %s\n", pcap_geterr(pd)); + infoprint = 0; return; } ==== //depot/projects/zcopybpf/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/zcopybpf/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.82 2007/12/02 20:40:30 rwatson Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -38,6 +38,7 @@ #include <machine/md_var.h> #include <machine/pcb.h> #include <machine/reg.h> +#include <machine/stack.h> #include <vm/vm.h> #include <vm/vm_param.h> @@ -177,18 +178,6 @@ return (1); } -/* - * Stack trace. - */ -#define INKERNEL(va) (((va) >= DMAP_MIN_ADDRESS && (va) < DMAP_MAX_ADDRESS) \ - || ((va) >= KERNBASE && (va) < VM_MAX_KERNEL_ADDRESS)) - -struct amd64_frame { - struct amd64_frame *f_frame; - long f_retaddr; - long f_arg0; -}; - #define NORMAL 0 #define TRAP 1 #define INTERRUPT 2 @@ -317,7 +306,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 || @@ -504,32 +494,6 @@ ctx->pcb_rip, count)); } -void -stack_save(struct stack *st) -{ - struct amd64_frame *frame; - vm_offset_t callpc; - register_t rbp; - - stack_zero(st); - __asm __volatile("movq %%rbp,%0" : "=r" (rbp)); - frame = (struct amd64_frame *)rbp; - while (1) { - if (!INKERNEL((long)frame)) - break; - callpc = frame->f_retaddr; - if (!INKERNEL(callpc)) - break; - if (stack_put(st, callpc) == -1) - break; - if (frame->f_frame <= frame || - (vm_offset_t)frame->f_frame >= - (vm_offset_t)rbp + KSTACK_PAGES * PAGE_SIZE) - break; - frame = frame->f_frame; - } -} - int amd64_set_watch(watchnum, watchaddr, size, access, d) int watchnum; ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/exception.S#2 (text+ko) ==== @@ -1,8 +1,12 @@ /*- * Copyright (c) 1989, 1990 William F. Jolitz. * Copyright (c) 1990 The Regents of the University of California. + * Copyright (c) 2007 The FreeBSD Foundation * All rights reserved. * + * Portions of this software were developed by A. Joseph Koshy under + * sponsorship from the FreeBSD Foundation and Google, Inc. + * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: @@ -27,11 +31,12 @@ * 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.131 2007/12/07 08:20:15 jkoshy Exp $ */ #include "opt_atpic.h" #include "opt_compat.h" +#include "opt_hwpmc_hooks.h" #include <machine/asmacros.h> #include <machine/psl.h> @@ -40,6 +45,9 @@ #include "assym.s" .text +#ifdef HWPMC_HOOKS + ENTRY(start_exceptions) +#endif /*****************************************************************************/ /* Trap handling */ @@ -187,10 +195,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 @@ -330,6 +356,9 @@ * execute the NMI handler with interrupts disabled to prevent a * nested interrupt from executing an 'iretq' instruction and * inadvertently taking the processor out of NMI mode. + * + * Third, the NMI handler runs on its own stack (tss_ist1), shared + * with the double fault handler. */ IDTVEC(nmi) @@ -368,6 +397,61 @@ movq %rsp, %rdi call trap MEXITCOUNT +#ifdef HWPMC_HOOKS + /* + * Check if the current trap was from user mode and if so + * whether the current thread needs a user call chain to be + * captured. We are still in NMI mode at this point. + */ + testb $SEL_RPL_MASK,TF_CS(%rsp) + jz nocallchain + movq PCPU(CURTHREAD),%rax /* curthread present? */ + orq %rax,%rax + jz nocallchain + testl $TDP_CALLCHAIN,TD_PFLAGS(%rax) /* flagged for capture? */ + jz nocallchain + /* + * A user callchain is to be captured, so: + * - Move execution to the regular kernel stack, to allow for + * nested NMI interrupts. + * - Take the processor out of "NMI" mode by faking an "iret". + * - Enable interrupts, so that copyin() can work. + */ + movq %rsp,%rsi /* source stack pointer */ + movq $TF_SIZE,%rcx + movq PCPU(RSP0),%rbx + subq %rcx,%rbx + movq %rbx,%rdi /* destination stack pointer */ + + shrq $3,%rcx /* trap frame size in long words */ + cld + rep + movsq /* copy trapframe */ + + movl %ss,%eax + pushq %rax /* tf_ss */ + pushq %rbx /* tf_rsp (on kernel stack) */ + pushfq /* tf_rflags */ + movl %cs,%eax + pushq %rax /* tf_cs */ + pushq $outofnmi /* tf_rip */ + iretq +outofnmi: + /* + * At this point the processor has exited NMI mode and is running + * with interrupts turned off on the normal kernel stack. + * We turn interrupts back on, and take the usual 'doreti' exit + * path. + * + * If a pending NMI gets recognized at or after this point, it + * will cause a kernel callchain to be traced. Since this path + * is only taken for NMI interrupts from user space, our `swapgs' + * state is correct for taking the doreti path. + */ + sti + jmp doreti +nocallchain: +#endif testl %ebx,%ebx jz nmi_restoreregs swapgs @@ -538,3 +622,6 @@ movq $0,TF_ADDR(%rsp) FAKE_MCOUNT(TF_RIP(%rsp)) jmp calltrap +#ifdef HWPMC_HOOKS + ENTRY(end_exceptions) +#endif ==== //depot/projects/zcopybpf/src/sys/amd64/amd64/genassym.c#5 (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); >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200712182214.lBIMECx6062112>