PERFORCE change 120698 for review
Paolo Pisati
piso at FreeBSD.org
Fri Jun 1 09:03:53 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=120698
Change 120698 by piso at piso_skytech on 2007/06/01 09:02:45
IFC at 120696
Affected files ...
.. //depot/projects/soc2006/intr_filter/amd64/acpica/madt.c#5 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/busdma_machdep.c#5 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/elf_machdep.c#2 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/identcpu.c#6 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#30 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/io_apic.c#6 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/local_apic.c#11 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/machdep.c#11 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/mp_machdep.c#8 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/mptable.c#4 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/msi.c#4 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/nexus.c#9 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/pmap.c#15 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/support.S#6 integrate
.. //depot/projects/soc2006/intr_filter/amd64/amd64/trap.c#10 integrate
.. //depot/projects/soc2006/intr_filter/amd64/conf/GENERIC#13 integrate
.. //depot/projects/soc2006/intr_filter/amd64/conf/NOTES#8 integrate
.. //depot/projects/soc2006/intr_filter/amd64/include/apicvar.h#7 integrate
.. //depot/projects/soc2006/intr_filter/amd64/include/intr_machdep.h#10 integrate
.. //depot/projects/soc2006/intr_filter/amd64/include/md_var.h#4 integrate
.. //depot/projects/soc2006/intr_filter/amd64/include/smp.h#3 integrate
.. //depot/projects/soc2006/intr_filter/amd64/include/specialreg.h#5 integrate
.. //depot/projects/soc2006/intr_filter/amd64/isa/atpic.c#4 integrate
.. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_machdep.c#12 integrate
.. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_support.s#1 branch
.. //depot/projects/soc2006/intr_filter/amd64/linux32/linux32_sysvec.c#7 integrate
.. //depot/projects/soc2006/intr_filter/arm/arm/busdma_machdep.c#5 integrate
.. //depot/projects/soc2006/intr_filter/arm/arm/elf_machdep.c#2 integrate
.. //depot/projects/soc2006/intr_filter/arm/arm/genassym.c#5 integrate
.. //depot/projects/soc2006/intr_filter/arm/arm/intr.c#24 integrate
.. //depot/projects/soc2006/intr_filter/arm/arm/machdep.c#3 integrate
.. //depot/projects/soc2006/intr_filter/arm/arm/pmap.c#9 integrate
.. //depot/projects/soc2006/intr_filter/arm/arm/vm_machdep.c#7 integrate
.. //depot/projects/soc2006/intr_filter/arm/at91/kb920x_machdep.c#11 integrate
.. //depot/projects/soc2006/intr_filter/arm/conf/AVILA#3 integrate
.. //depot/projects/soc2006/intr_filter/arm/conf/AVILA.hints#1 branch
.. //depot/projects/soc2006/intr_filter/arm/include/asm.h#3 integrate
.. //depot/projects/soc2006/intr_filter/arm/include/pmap.h#5 integrate
.. //depot/projects/soc2006/intr_filter/arm/include/profile.h#2 integrate
.. //depot/projects/soc2006/intr_filter/arm/include/vmparam.h#5 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/ep80219_machdep.c#6 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/i80321/iq31244_machdep.c#8 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/avila_ata.c#4 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/avila_machdep.c#5 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/if_npe.c#4 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425.c#5 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_npe.c#4 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425_npevar.h#2 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/ixp425var.h#3 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/uart_bus_ixp425.c#2 integrate
.. //depot/projects/soc2006/intr_filter/arm/xscale/ixp425/uart_cpu_ixp425.c#3 integrate
.. //depot/projects/soc2006/intr_filter/boot/common/loader.8#7 integrate
.. //depot/projects/soc2006/intr_filter/boot/i386/Makefile#2 integrate
.. //depot/projects/soc2006/intr_filter/boot/i386/boot2/Makefile#2 integrate
.. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/Makefile#1 branch
.. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/dconsole.c#1 branch
.. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/firewire.c#1 branch
.. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/fwohci.c#1 branch
.. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/fwohci.h#1 branch
.. //depot/projects/soc2006/intr_filter/boot/i386/libfirewire/fwohcireg.h#1 branch
.. //depot/projects/soc2006/intr_filter/boot/i386/libi386/smbios.c#2 integrate
.. //depot/projects/soc2006/intr_filter/boot/i386/loader/Makefile#3 integrate
.. //depot/projects/soc2006/intr_filter/boot/i386/loader/conf.c#2 integrate
.. //depot/projects/soc2006/intr_filter/boot/i386/loader/main.c#5 integrate
.. //depot/projects/soc2006/intr_filter/boot/ia64/common/exec.c#2 integrate
.. //depot/projects/soc2006/intr_filter/cam/README.quirks#1 branch
.. //depot/projects/soc2006/intr_filter/cam/cam.c#2 integrate
.. //depot/projects/soc2006/intr_filter/cam/cam_periph.c#5 integrate
.. //depot/projects/soc2006/intr_filter/cam/cam_xpt.c#11 integrate
.. //depot/projects/soc2006/intr_filter/cam/cam_xpt.h#5 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_all.c#3 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_cd.c#5 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_ch.c#4 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_da.c#9 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_pass.c#5 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_pt.c#4 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_sa.c#4 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_ses.c#4 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_sg.c#2 integrate
.. //depot/projects/soc2006/intr_filter/cam/scsi/scsi_targ_bh.c#4 integrate
.. //depot/projects/soc2006/intr_filter/coda/coda_vnops.c#4 integrate
.. //depot/projects/soc2006/intr_filter/coda/coda_vnops.h#3 integrate
.. //depot/projects/soc2006/intr_filter/compat/freebsd32/freebsd32_misc.c#7 integrate
.. //depot/projects/soc2006/intr_filter/compat/ia32/ia32_sysvec.c#3 integrate
.. //depot/projects/soc2006/intr_filter/compat/linprocfs/linprocfs.c#13 integrate
.. //depot/projects/soc2006/intr_filter/compat/linux/linux_futex.c#5 integrate
.. //depot/projects/soc2006/intr_filter/compat/linux/linux_misc.c#12 integrate
.. //depot/projects/soc2006/intr_filter/compat/ndis/kern_windrv.c#2 integrate
.. //depot/projects/soc2006/intr_filter/compat/ndis/subr_ndis.c#4 integrate
.. //depot/projects/soc2006/intr_filter/compat/opensolaris/kern/opensolaris_kobj.c#3 integrate
.. //depot/projects/soc2006/intr_filter/compat/opensolaris/sys/dnlc.h#1 branch
.. //depot/projects/soc2006/intr_filter/compat/opensolaris/sys/mutex.h#2 integrate
.. //depot/projects/soc2006/intr_filter/compat/opensolaris/sys/rwlock.h#2 integrate
.. //depot/projects/soc2006/intr_filter/compat/opensolaris/sys/vnode.h#2 integrate
.. //depot/projects/soc2006/intr_filter/compat/svr4/svr4_misc.c#5 integrate
.. //depot/projects/soc2006/intr_filter/conf/Makefile.amd64#2 integrate
.. //depot/projects/soc2006/intr_filter/conf/Makefile.arm#5 integrate
.. //depot/projects/soc2006/intr_filter/conf/Makefile.i386#2 integrate
.. //depot/projects/soc2006/intr_filter/conf/Makefile.ia64#2 integrate
.. //depot/projects/soc2006/intr_filter/conf/Makefile.pc98#2 integrate
.. //depot/projects/soc2006/intr_filter/conf/Makefile.powerpc#2 integrate
.. //depot/projects/soc2006/intr_filter/conf/Makefile.sparc64#2 integrate
.. //depot/projects/soc2006/intr_filter/conf/Makefile.sun4v#2 integrate
.. //depot/projects/soc2006/intr_filter/conf/NOTES#18 integrate
.. //depot/projects/soc2006/intr_filter/conf/files#20 integrate
.. //depot/projects/soc2006/intr_filter/conf/files.amd64#10 integrate
.. //depot/projects/soc2006/intr_filter/conf/files.i386#10 integrate
.. //depot/projects/soc2006/intr_filter/conf/files.pc98#8 integrate
.. //depot/projects/soc2006/intr_filter/conf/kern.mk#4 integrate
.. //depot/projects/soc2006/intr_filter/conf/kern.pre.mk#7 integrate
.. //depot/projects/soc2006/intr_filter/conf/kmod.mk#9 integrate
.. //depot/projects/soc2006/intr_filter/conf/options#18 integrate
.. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/dnlc.c#2 delete
.. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/gfs.c#3 integrate
.. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/zfs/vdev_geom.c#3 integrate
.. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/zfs/zfs_replay.c#2 integrate
.. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate
.. //depot/projects/soc2006/intr_filter/contrib/opensolaris/uts/common/sys/dnlc.h#2 delete
.. //depot/projects/soc2006/intr_filter/contrib/pf/net/pf.c#5 integrate
.. //depot/projects/soc2006/intr_filter/crypto/camellia/camellia-api.c#1 branch
.. //depot/projects/soc2006/intr_filter/crypto/camellia/camellia.c#1 branch
.. //depot/projects/soc2006/intr_filter/crypto/camellia/camellia.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/acpica/Osd/OsdHardware.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/acpica/acpi.c#9 integrate
.. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_dock.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/acpica/acpi_hpet.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/acpica/acpivar.h#6 integrate
.. //depot/projects/soc2006/intr_filter/dev/ath/if_ath.c#15 integrate
.. //depot/projects/soc2006/intr_filter/dev/bce/if_bce.c#15 integrate
.. //depot/projects/soc2006/intr_filter/dev/bce/if_bcefw.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/bce/if_bcereg.h#6 integrate
.. //depot/projects/soc2006/intr_filter/dev/bge/if_bge.c#18 integrate
.. //depot/projects/soc2006/intr_filter/dev/bge/if_bgereg.h#14 integrate
.. //depot/projects/soc2006/intr_filter/dev/cardbus/cardbus.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/cardbus/cardbus_cis.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/ciss/ciss.c#8 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_ael1002.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_common.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_ctl_defs.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_firmware_exports.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_mc5.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_mv88e1xxx.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_regs.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_sge_defs.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_t3_cpl.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_t3_hw.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_tcb.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_version.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_vsc8211.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/cxgb_xgmac.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/common/jhash.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_adapter.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_config.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_include.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_ioctl.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_l2t.c#1 branch
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_l2t.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_lro.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_main.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_offload.c#1 branch
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_offload.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_osdep.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/cxgb_sge.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/sys/mbufq.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/cxgb/sys/mvec.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/sys/uipc_mvec.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/cxgb/t3fw-3.2.bin.gz.uu#2 delete
.. //depot/projects/soc2006/intr_filter/dev/cxgb/t3fw-4.0.0.bin.gz.uu#1 branch
.. //depot/projects/soc2006/intr_filter/dev/cxgb/ulp/toecore/toedev.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/dcons/dcons.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/dcons/dcons_crom.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/dcons/dcons_os.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/de/if_devar.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/README#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_80003es2lan.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_80003es2lan.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82540.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82541.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82541.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82542.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82543.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82543.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82571.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82571.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82575.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_82575.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_api.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_api.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_defines.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_hw.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_ich8lan.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_ich8lan.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_mac.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_mac.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_manage.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_manage.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_nvm.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_nvm.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_osdep.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_phy.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_phy.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/e1000_regs.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/if_em.c#21 integrate
.. //depot/projects/soc2006/intr_filter/dev/em/if_em.h#10 integrate
.. //depot/projects/soc2006/intr_filter/dev/en/midway.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/firewire/firewire.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/firewire/firewirereg.h#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/firewire/sbp_targ.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/fxp/if_fxp.c#10 integrate
.. //depot/projects/soc2006/intr_filter/dev/hptiop/hptiop.c#1 branch
.. //depot/projects/soc2006/intr_filter/dev/hptiop/hptiop.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/hptmv/ioctl.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/if_ndis/if_ndis.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/isp/isp_freebsd.c#14 integrate
.. //depot/projects/soc2006/intr_filter/dev/isp/isp_pci.c#17 integrate
.. //depot/projects/soc2006/intr_filter/dev/isp/isp_sbus.c#13 integrate
.. //depot/projects/soc2006/intr_filter/dev/lmc/if_lmc.c#6 integrate
.. //depot/projects/soc2006/intr_filter/dev/md/md.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/mfi/mfi.c#13 integrate
.. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_cam.c#1 branch
.. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_disk.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_ioctl.h#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/mfi/mfi_pci.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/mfi/mfireg.h#6 integrate
.. //depot/projects/soc2006/intr_filter/dev/mfi/mfivar.h#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/mmc/bridge.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/mmc/mmc.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/mmc/mmcbr_if.m#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/mmc/mmcbrvar.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/mmc/mmcbus_if.m#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/mmc/mmcreg.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/mmc/mmcsd.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/mmc/mmcvar.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/mxge/eth_z8e.dat.gz.uu#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/mxge/ethp_z8e.dat.gz.uu#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge.c#10 integrate
.. //depot/projects/soc2006/intr_filter/dev/mxge/if_mxge_var.h#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/mxge/mxge_lro.c#1 branch
.. //depot/projects/soc2006/intr_filter/dev/mxge/mxge_mcp.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/pccard/pccard.c#9 integrate
.. //depot/projects/soc2006/intr_filter/dev/pccard/pccardvarp.h#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbb.c#15 integrate
.. //depot/projects/soc2006/intr_filter/dev/pccbb/pccbbvar.h#9 integrate
.. //depot/projects/soc2006/intr_filter/dev/pci/pci.c#14 integrate
.. //depot/projects/soc2006/intr_filter/dev/pci/pci_pci.c#8 integrate
.. //depot/projects/soc2006/intr_filter/dev/pci/pci_private.h#7 integrate
.. //depot/projects/soc2006/intr_filter/dev/pci/pcireg.h#9 integrate
.. //depot/projects/soc2006/intr_filter/dev/random/randomdev_soft.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/random/yarrow.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/sk/if_sk.c#10 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/clone.c#1 branch
.. //depot/projects/soc2006/intr_filter/dev/sound/clone.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/sound/isa/ess.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/isa/mss.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/emu10k1.c#8 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24.c#9 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24ht.c#6 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/envy24ht.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/fm801.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/hda/hdac.c#12 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/solo.c#6 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/spicds.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/spicds.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pci/via8233.c#7 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/ac97.c#7 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/buffer.c#8 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel.c#7 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/channel.h#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.c#7 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/dsp.h#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/feeder.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/mixer.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sndstat.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.c#9 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/sound.h#8 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/vchan.c#6 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/pcm/vchan.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/unit.c#1 branch
.. //depot/projects/soc2006/intr_filter/dev/sound/unit.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/sound/usb/uaudio.c#8 integrate
.. //depot/projects/soc2006/intr_filter/dev/sound/version.h#1 branch
.. //depot/projects/soc2006/intr_filter/dev/syscons/scmouse.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_externs.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_fwif.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_fwimg.c#2 delete
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_init.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_intr.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_io.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_ioctl.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_misc.c#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_cl_share.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_cam.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_externs.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_freebsd.c#7 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_includes.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_inline.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_ioctl.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_share.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/twa/tw_osl_types.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/uart/uart_bus_pci.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_axe.c#6 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_cue.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_cuereg.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_kue.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_kuereg.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_rue.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_ruereg.h#2 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_udav.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_ural.c#9 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/if_uralvar.h#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/ubsa.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/ufoma.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/uhid.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/ukbd.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/ums.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/usb.c#4 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/usb_mem.c#3 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/usb_subr.c#5 integrate
.. //depot/projects/soc2006/intr_filter/dev/usb/usbdevs#15 integrate
.. //depot/projects/soc2006/intr_filter/fs/devfs/devfs_vnops.c#8 integrate
.. //depot/projects/soc2006/intr_filter/fs/fifofs/fifo_vnops.c#4 integrate
.. //depot/projects/soc2006/intr_filter/fs/nullfs/null_vfsops.c#4 integrate
.. //depot/projects/soc2006/intr_filter/fs/nullfs/null_vnops.c#4 integrate
.. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_io.c#3 integrate
.. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_node.c#4 integrate
.. //depot/projects/soc2006/intr_filter/fs/smbfs/smbfs_vnops.c#3 integrate
.. //depot/projects/soc2006/intr_filter/fs/umapfs/umap_vnops.c#3 integrate
.. //depot/projects/soc2006/intr_filter/fs/unionfs/union.h#3 integrate
.. //depot/projects/soc2006/intr_filter/fs/unionfs/union_subr.c#6 integrate
.. //depot/projects/soc2006/intr_filter/fs/unionfs/union_vnops.c#6 integrate
.. //depot/projects/soc2006/intr_filter/geom/part/g_part.c#3 integrate
.. //depot/projects/soc2006/intr_filter/geom/part/g_part.h#2 integrate
.. //depot/projects/soc2006/intr_filter/geom/part/g_part_apm.c#2 integrate
.. //depot/projects/soc2006/intr_filter/geom/part/g_part_gpt.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/ext2fs/ext2_bmap.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/support/spin.h#3 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/FreeBSD/xfs_mountops.c#4 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_bit.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_bmap.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_bmap_btree.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_dir.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_ialloc.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_inode.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_log.c#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_log_recover.c#3 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_rtalloc.h#2 integrate
.. //depot/projects/soc2006/intr_filter/gnu/fs/xfs/xfs_vnodeops.c#2 integrate
.. //depot/projects/soc2006/intr_filter/i386/Makefile#2 integrate
.. //depot/projects/soc2006/intr_filter/i386/acpica/madt.c#5 integrate
.. //depot/projects/soc2006/intr_filter/i386/conf/GENERIC#14 integrate
.. //depot/projects/soc2006/intr_filter/i386/conf/NOTES#9 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/busdma_machdep.c#5 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/elf_machdep.c#2 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/identcpu.c#8 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/intr_machdep.c#37 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/io_apic.c#6 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/local_apic.c#11 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/machdep.c#13 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/mp_machdep.c#9 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/mptable.c#4 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/msi.c#4 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/nexus.c#10 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/pmap.c#14 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/support.s#6 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/sys_machdep.c#5 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/trap.c#9 integrate
.. //depot/projects/soc2006/intr_filter/i386/i386/vm_machdep.c#5 integrate
.. //depot/projects/soc2006/intr_filter/i386/ibcs2/imgact_coff.c#3 integrate
.. //depot/projects/soc2006/intr_filter/i386/include/apicvar.h#7 integrate
.. //depot/projects/soc2006/intr_filter/i386/include/intr_machdep.h#10 integrate
.. //depot/projects/soc2006/intr_filter/i386/include/proc.h#2 integrate
.. //depot/projects/soc2006/intr_filter/i386/include/smp.h#3 integrate
.. //depot/projects/soc2006/intr_filter/i386/include/specialreg.h#7 integrate
.. //depot/projects/soc2006/intr_filter/i386/include/vmparam.h#4 integrate
.. //depot/projects/soc2006/intr_filter/i386/isa/atpic.c#4 integrate
.. //depot/projects/soc2006/intr_filter/i386/linux/linux_machdep.c#10 integrate
.. //depot/projects/soc2006/intr_filter/i386/linux/linux_support.s#1 branch
.. //depot/projects/soc2006/intr_filter/ia64/ia64/busdma_machdep.c#4 integrate
.. //depot/projects/soc2006/intr_filter/ia64/ia64/elf_machdep.c#2 integrate
.. //depot/projects/soc2006/intr_filter/ia64/ia64/exception.S#2 integrate
.. //depot/projects/soc2006/intr_filter/ia64/ia64/interrupt.c#27 integrate
.. //depot/projects/soc2006/intr_filter/ia64/ia64/locore.S#2 integrate
.. //depot/projects/soc2006/intr_filter/ia64/ia64/machdep.c#8 integrate
.. //depot/projects/soc2006/intr_filter/ia64/ia64/mca.c#2 integrate
.. //depot/projects/soc2006/intr_filter/ia64/ia64/pmap.c#8 integrate
.. //depot/projects/soc2006/intr_filter/ia64/ia64/trap.c#7 integrate
.. //depot/projects/soc2006/intr_filter/ia64/include/ia64_cpu.h#2 integrate
.. //depot/projects/soc2006/intr_filter/ia64/include/vmparam.h#5 integrate
.. //depot/projects/soc2006/intr_filter/kern/Make.tags.inc#4 integrate
.. //depot/projects/soc2006/intr_filter/kern/imgact_elf.c#4 integrate
.. //depot/projects/soc2006/intr_filter/kern/init_main.c#9 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_acct.c#7 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_clock.c#7 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_condvar.c#5 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_conf.c#4 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_descrip.c#15 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_event.c#7 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_exec.c#8 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_exit.c#7 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_fork.c#11 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_intr.c#42 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_ktrace.c#10 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_linker.c#12 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_lock.c#9 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_malloc.c#5 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_mib.c#3 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_mtxpool.c#2 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_mutex.c#10 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_proc.c#6 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_resource.c#11 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_rwlock.c#9 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_sig.c#11 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_sx.c#9 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_synch.c#11 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_thread.c#9 integrate
.. //depot/projects/soc2006/intr_filter/kern/kern_timeout.c#3 integrate
.. //depot/projects/soc2006/intr_filter/kern/link_elf.c#7 integrate
.. //depot/projects/soc2006/intr_filter/kern/link_elf_obj.c#6 integrate
.. //depot/projects/soc2006/intr_filter/kern/subr_bus.c#12 integrate
.. //depot/projects/soc2006/intr_filter/kern/subr_lock.c#6 integrate
.. //depot/projects/soc2006/intr_filter/kern/subr_mbpool.c#2 integrate
.. //depot/projects/soc2006/intr_filter/kern/subr_prof.c#3 integrate
.. //depot/projects/soc2006/intr_filter/kern/subr_sleepqueue.c#4 integrate
.. //depot/projects/soc2006/intr_filter/kern/subr_trap.c#5 integrate
.. //depot/projects/soc2006/intr_filter/kern/subr_turnstile.c#7 integrate
.. //depot/projects/soc2006/intr_filter/kern/subr_witness.c#9 integrate
.. //depot/projects/soc2006/intr_filter/kern/sys_pipe.c#6 integrate
.. //depot/projects/soc2006/intr_filter/kern/tty_cons.c#3 integrate
.. //depot/projects/soc2006/intr_filter/kern/uipc_domain.c#3 integrate
.. //depot/projects/soc2006/intr_filter/kern/uipc_mbuf.c#8 integrate
.. //depot/projects/soc2006/intr_filter/kern/uipc_mqueue.c#8 integrate
.. //depot/projects/soc2006/intr_filter/kern/uipc_sockbuf.c#6 integrate
.. //depot/projects/soc2006/intr_filter/kern/uipc_socket.c#15 integrate
.. //depot/projects/soc2006/intr_filter/kern/uipc_syscalls.c#13 integrate
.. //depot/projects/soc2006/intr_filter/kern/uipc_usrreq.c#14 integrate
.. //depot/projects/soc2006/intr_filter/kern/vfs_aio.c#7 integrate
.. //depot/projects/soc2006/intr_filter/kern/vfs_bio.c#12 integrate
.. //depot/projects/soc2006/intr_filter/kern/vfs_cache.c#5 integrate
.. //depot/projects/soc2006/intr_filter/kern/vfs_cluster.c#5 integrate
.. //depot/projects/soc2006/intr_filter/kern/vfs_default.c#5 integrate
.. //depot/projects/soc2006/intr_filter/kern/vfs_lookup.c#7 integrate
.. //depot/projects/soc2006/intr_filter/kern/vfs_subr.c#11 integrate
.. //depot/projects/soc2006/intr_filter/kern/vfs_syscalls.c#12 integrate
.. //depot/projects/soc2006/intr_filter/kern/vfs_vnops.c#6 integrate
.. //depot/projects/soc2006/intr_filter/kern/vnode_if.src#4 integrate
.. //depot/projects/soc2006/intr_filter/modules/Makefile#16 integrate
.. //depot/projects/soc2006/intr_filter/modules/crypto/Makefile#3 integrate
.. //depot/projects/soc2006/intr_filter/modules/cxgb/Makefile#3 integrate
.. //depot/projects/soc2006/intr_filter/modules/dcons/Makefile#2 integrate
.. //depot/projects/soc2006/intr_filter/modules/hptiop/Makefile#1 branch
.. //depot/projects/soc2006/intr_filter/modules/linux/Makefile#4 integrate
.. //depot/projects/soc2006/intr_filter/modules/mfi/Makefile#3 integrate
.. //depot/projects/soc2006/intr_filter/modules/mfi/mfip/Makefile#1 branch
.. //depot/projects/soc2006/intr_filter/modules/mxge/mxge/Makefile#2 integrate
.. //depot/projects/soc2006/intr_filter/modules/netgraph/Makefile#4 integrate
.. //depot/projects/soc2006/intr_filter/modules/netgraph/car/Makefile#1 branch
.. //depot/projects/soc2006/intr_filter/modules/sound/sound/Makefile#4 integrate
.. //depot/projects/soc2006/intr_filter/modules/twa/Makefile#2 integrate
.. //depot/projects/soc2006/intr_filter/modules/zfs/Makefile#2 integrate
.. //depot/projects/soc2006/intr_filter/net/ethernet.h#5 integrate
.. //depot/projects/soc2006/intr_filter/net/ieee8023ad_lacp.c#4 integrate
.. //depot/projects/soc2006/intr_filter/net/ieee8023ad_lacp.h#3 integrate
.. //depot/projects/soc2006/intr_filter/net/if.c#12 integrate
.. //depot/projects/soc2006/intr_filter/net/if.h#5 integrate
.. //depot/projects/soc2006/intr_filter/net/if_bridge.c#13 integrate
.. //depot/projects/soc2006/intr_filter/net/if_ethersubr.c#11 integrate
.. //depot/projects/soc2006/intr_filter/net/if_fwsubr.c#3 integrate
.. //depot/projects/soc2006/intr_filter/net/if_lagg.c#4 integrate
.. //depot/projects/soc2006/intr_filter/net/if_lagg.h#4 integrate
.. //depot/projects/soc2006/intr_filter/net/if_var.h#7 integrate
.. //depot/projects/soc2006/intr_filter/net/pfkeyv2.h#2 integrate
.. //depot/projects/soc2006/intr_filter/net/route.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netatalk/ddp_usrreq.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netgraph/bluetooth/socket/ng_btsocket_l2cap.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netgraph/ng_base.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netgraph/ng_car.c#1 branch
.. //depot/projects/soc2006/intr_filter/netgraph/ng_car.h#1 branch
.. //depot/projects/soc2006/intr_filter/netgraph/ng_fec.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netgraph/ng_mppc.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netgraph/ng_nat.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netgraph/ng_nat.h#2 integrate
.. //depot/projects/soc2006/intr_filter/netgraph/ng_socket.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet/icmp6.h#2 integrate
.. //depot/projects/soc2006/intr_filter/netinet/if_ether.c#8 integrate
.. //depot/projects/soc2006/intr_filter/netinet/in.c#7 integrate
.. //depot/projects/soc2006/intr_filter/netinet/in_cksum.c#2 integrate
.. //depot/projects/soc2006/intr_filter/netinet/in_gif.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/in_pcb.c#11 integrate
.. //depot/projects/soc2006/intr_filter/netinet/in_pcb.h#6 integrate
.. //depot/projects/soc2006/intr_filter/netinet/in_rmx.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_divert.c#7 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_dummynet.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_ecn.c#2 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_encap.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_fw2.c#15 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_icmp.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_id.c#2 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_input.c#6 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_ipsec.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_mroute.c#8 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_options.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_options.h#2 integrate
.. //depot/projects/soc2006/intr_filter/netinet/ip_output.c#9 integrate
.. //depot/projects/soc2006/intr_filter/netinet/raw_ip.c#8 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp.h#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.c#9 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_asconf.h#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.c#8 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_auth.h#4 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_bsd_addr.c#6 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_bsd_addr.h#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_constants.h#9 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_crc32.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_crc32.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_header.h#4 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.c#10 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_indata.h#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_input.c#11 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_input.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_lock_bsd.h#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_os.h#6 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_os_bsd.h#9 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_output.c#10 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_output.h#6 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.c#10 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_pcb.h#8 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_peeloff.c#8 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_peeloff.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_structs.h#9 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_sysctl.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_sysctl.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.c#8 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_timer.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_uio.h#8 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_usrreq.c#10 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctp_var.h#7 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctputil.c#11 integrate
.. //depot/projects/soc2006/intr_filter/netinet/sctputil.h#9 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp.h#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_fsm.h#2 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_hostcache.c#4 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_input.c#15 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_output.c#9 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_reass.c#1 branch
.. //depot/projects/soc2006/intr_filter/netinet/tcp_sack.c#4 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_subr.c#13 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_syncache.c#11 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_timer.c#8 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_timer.h#6 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_timewait.c#1 branch
.. //depot/projects/soc2006/intr_filter/netinet/tcp_usrreq.c#12 integrate
.. //depot/projects/soc2006/intr_filter/netinet/tcp_var.h#11 integrate
.. //depot/projects/soc2006/intr_filter/netinet/udp_usrreq.c#11 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/esp_camellia.c#1 branch
.. //depot/projects/soc2006/intr_filter/netinet6/esp_camellia.h#1 branch
.. //depot/projects/soc2006/intr_filter/netinet6/esp_core.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/icmp6.c#7 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/in6.c#9 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/in6_pcb.c#7 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/in6_pcb.h#2 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/in6_proto.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/ip6_input.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/nd6.c#9 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/raw_ip6.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/sctp6_usrreq.c#10 integrate
.. //depot/projects/soc2006/intr_filter/netinet6/sctp6_var.h#4 integrate
.. //depot/projects/soc2006/intr_filter/netipsec/ipsec.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netipsec/ipsec_output.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netipsec/key.c#2 integrate
.. //depot/projects/soc2006/intr_filter/netipsec/xform_esp.c#2 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx_cksum.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx_if.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx_input.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx_outputfl.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx_pcb.c#4 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx_pcb.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx_usrreq.c#5 integrate
.. //depot/projects/soc2006/intr_filter/netipx/ipx_var.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netipx/spx_debug.c#3 integrate
.. //depot/projects/soc2006/intr_filter/netipx/spx_debug.h#3 integrate
.. //depot/projects/soc2006/intr_filter/netncp/ncp_conn.c#3 integrate
.. //depot/projects/soc2006/intr_filter/nfs4client/nfs4_vnops.c#5 integrate
.. //depot/projects/soc2006/intr_filter/nfsclient/nfs_bio.c#4 integrate
.. //depot/projects/soc2006/intr_filter/nfsclient/nfs_socket.c#10 integrate
.. //depot/projects/soc2006/intr_filter/nfsclient/nfs_vnops.c#9 integrate
.. //depot/projects/soc2006/intr_filter/opencrypto/cryptodev.c#4 integrate
.. //depot/projects/soc2006/intr_filter/opencrypto/cryptodev.h#3 integrate
.. //depot/projects/soc2006/intr_filter/opencrypto/cryptosoft.c#3 integrate
.. //depot/projects/soc2006/intr_filter/opencrypto/xform.c#2 integrate
.. //depot/projects/soc2006/intr_filter/opencrypto/xform.h#2 integrate
.. //depot/projects/soc2006/intr_filter/pc98/conf/GENERIC#11 integrate
.. //depot/projects/soc2006/intr_filter/pc98/pc98/machdep.c#10 integrate
.. //depot/projects/soc2006/intr_filter/pci/if_tl.c#5 integrate
.. //depot/projects/soc2006/intr_filter/pci/ncr.c#6 integrate
.. //depot/projects/soc2006/intr_filter/powerpc/include/vmparam.h#4 integrate
.. //depot/projects/soc2006/intr_filter/powerpc/powerpc/clock.c#4 integrate
.. //depot/projects/soc2006/intr_filter/powerpc/powerpc/elf_machdep.c#2 integrate
.. //depot/projects/soc2006/intr_filter/powerpc/powerpc/intr_machdep.c#32 integrate
.. //depot/projects/soc2006/intr_filter/powerpc/powerpc/machdep.c#7 integrate
.. //depot/projects/soc2006/intr_filter/security/audit/audit.c#7 integrate
.. //depot/projects/soc2006/intr_filter/security/audit/audit.h#5 integrate
.. //depot/projects/soc2006/intr_filter/security/audit/audit_bsm_token.c#6 integrate
.. //depot/projects/soc2006/intr_filter/security/audit/audit_private.h#5 integrate
.. //depot/projects/soc2006/intr_filter/security/audit/audit_syscalls.c#7 integrate
.. //depot/projects/soc2006/intr_filter/security/audit/audit_worker.c#4 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/conf/GENERIC#12 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/include/profile.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/include/smp.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/include/ver.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/pci/ofw_pcibus.c#4 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/bus_machdep.c#4 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/elf_machdep.c#3 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/identcpu.c#3 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/intr_machdep.c#27 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/machdep.c#6 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/mem.c#3 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/mp_machdep.c#3 integrate
.. //depot/projects/soc2006/intr_filter/sparc64/sparc64/pmap.c#7 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/include/cache.h#3 delete
.. //depot/projects/soc2006/intr_filter/sun4v/include/iommureg.h#2 delete
.. //depot/projects/soc2006/intr_filter/sun4v/include/iommuvar.h#2 delete
.. //depot/projects/soc2006/intr_filter/sun4v/include/ofw_upa.h#2 delete
.. //depot/projects/soc2006/intr_filter/sun4v/include/pmap.h#3 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/include/profile.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/include/upa.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/include/ver.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/bus_machdep.c#3 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/hviommu.c#3 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/intr_machdep.c#12 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/machdep.c#5 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/nexus.c#6 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/pmap.c#6 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tick.c#3 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/trap.c#6 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tsb.c#5 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/tte_hash.c#4 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vm_machdep.c#4 integrate
.. //depot/projects/soc2006/intr_filter/sun4v/sun4v/vnex.c#7 integrate
.. //depot/projects/soc2006/intr_filter/sys/acct.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sys/callout.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sys/conf.h#4 integrate
.. //depot/projects/soc2006/intr_filter/sys/filedesc.h#4 integrate
.. //depot/projects/soc2006/intr_filter/sys/lock_profile.h#6 integrate
.. //depot/projects/soc2006/intr_filter/sys/lockf.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sys/param.h#13 integrate
.. //depot/projects/soc2006/intr_filter/sys/proc.h#12 integrate
.. //depot/projects/soc2006/intr_filter/sys/resource.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sys/resourcevar.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sys/rwlock.h#9 integrate
.. //depot/projects/soc2006/intr_filter/sys/sx.h#7 integrate
.. //depot/projects/soc2006/intr_filter/sys/sysctl.h#7 integrate
.. //depot/projects/soc2006/intr_filter/sys/sysent.h#6 integrate
.. //depot/projects/soc2006/intr_filter/sys/syslimits.h#2 integrate
.. //depot/projects/soc2006/intr_filter/sys/systm.h#12 integrate
.. //depot/projects/soc2006/intr_filter/sys/vmmeter.h#3 integrate
.. //depot/projects/soc2006/intr_filter/sys/vnode.h#8 integrate
.. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_inode.c#3 integrate
.. //depot/projects/soc2006/intr_filter/ufs/ffs/ffs_vnops.c#9 integrate
.. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_bmap.c#2 integrate
.. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_gjournal.c#2 integrate
.. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_quota.c#7 integrate
.. //depot/projects/soc2006/intr_filter/ufs/ufs/ufs_vnops.c#9 integrate
.. //depot/projects/soc2006/intr_filter/vm/swap_pager.c#9 integrate
.. //depot/projects/soc2006/intr_filter/vm/uma_core.c#6 integrate
.. //depot/projects/soc2006/intr_filter/vm/uma_int.h#2 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_contig.c#7 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_fault.c#10 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_glue.c#5 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_map.c#9 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_meter.c#6 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_mmap.c#4 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_object.c#11 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_page.c#11 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_pageout.c#6 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_pageq.c#6 integrate
.. //depot/projects/soc2006/intr_filter/vm/vm_zeroidle.c#6 integrate
.. //depot/projects/soc2006/intr_filter/vm/vnode_pager.c#5 integrate
Differences ...
==== //depot/projects/soc2006/intr_filter/amd64/acpica/madt.c#5 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.23 2007/03/22 18:16:38 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/acpica/madt.c,v 1.24 2007/05/08 22:01:02 jhb Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -53,21 +53,18 @@
#include <dev/acpica/acpivar.h>
#include <dev/pci/pcivar.h>
-#define NIOAPICS 32 /* Max number of I/O APICs */
-#define NLAPICS 32 /* Max number of local APICs */
-
typedef void madt_entry_handler(ACPI_SUBTABLE_HEADER *entry, void *arg);
/* These two arrays are indexed by APIC IDs. */
struct ioapic_info {
void *io_apic;
UINT32 io_vector;
-} ioapics[NIOAPICS];
+} ioapics[MAX_APIC_ID + 1];
struct lapic_info {
u_int la_enabled:1;
u_int la_acpi_id:8;
-} lapics[NLAPICS];
+} lapics[MAX_APIC_ID + 1];
static int madt_found_sci_override;
static ACPI_TABLE_MADT *madt;
@@ -393,7 +390,7 @@
}
/* Third, we register all the I/O APIC's. */
- for (i = 0; i < NIOAPICS; i++)
+ for (i = 0; i <= MAX_APIC_ID; i++)
if (ioapics[i].io_apic != NULL)
ioapic_register(ioapics[i].io_apic);
@@ -450,7 +447,7 @@
"enabled" : "disabled");
if (!(proc->LapicFlags & ACPI_MADT_ENABLED))
break;
- if (proc->Id >= NLAPICS)
+ if (proc->Id > MAX_APIC_ID)
panic("%s: CPU ID %u too high", __func__, proc->Id);
la = &lapics[proc->Id];
KASSERT(la->la_enabled == 0,
@@ -479,7 +476,7 @@
"MADT: Found IO APIC ID %u, Interrupt %u at %p\n",
apic->Id, apic->GlobalIrqBase,
(void *)(uintptr_t)apic->Address);
- if (apic->Id >= NIOAPICS)
+ if (apic->Id > MAX_APIC_ID)
panic("%s: I/O APIC ID %u too high", __func__,
apic->Id);
if (ioapics[apic->Id].io_apic != NULL)
@@ -545,7 +542,7 @@
{
int i;
- for (i = 0; i < NLAPICS; i++) {
+ for (i = 0; i <= MAX_APIC_ID; i++) {
if (!lapics[i].la_enabled)
continue;
if (lapics[i].la_acpi_id != acpi_id)
@@ -566,7 +563,7 @@
int i, best;
best = -1;
- for (i = 0; i < NIOAPICS; i++) {
+ for (i = 0; i <= MAX_APIC_ID; i++) {
if (ioapics[i].io_apic == NULL ||
ioapics[i].io_vector > intr)
continue;
==== //depot/projects/soc2006/intr_filter/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.80 2007/04/17 21:05:34 jhb Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/busdma_machdep.c,v 1.81 2007/05/29 06:30:25 yongari Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -649,6 +649,8 @@
* Compute the segment size, and adjust counts.
*/
sgsize = PAGE_SIZE - ((u_long)curaddr & PAGE_MASK);
+ if (sgsize > dmat->maxsegsz)
+ sgsize = dmat->maxsegsz;
if (buflen < sgsize)
sgsize = buflen;
==== //depot/projects/soc2006/intr_filter/amd64/amd64/elf_machdep.c#2 (text+ko) ====
@@ -24,7 +24,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.25 2005/12/26 21:23:56 sobomax Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/elf_machdep.c,v 1.26 2007/05/22 02:22:57 kan Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -82,7 +82,7 @@
"/libexec/ld-elf.so.1",
&elf64_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(elf64, SI_SUB_EXEC, SI_ORDER_ANY,
@@ -97,7 +97,7 @@
"/usr/libexec/ld-elf.so.1",
&elf64_freebsd_sysvec,
NULL,
- 0,
+ BI_CAN_EXEC_DYN,
};
SYSINIT(oelf64, SI_SUB_EXEC, SI_ORDER_ANY,
==== //depot/projects/soc2006/intr_filter/amd64/amd64/identcpu.c#6 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.153 2007/03/26 18:03:29 njl Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.154 2007/05/30 14:23:26 des Exp $");
#include "opt_cpu.h"
@@ -236,7 +236,7 @@
"\015<b12>"
"\016CX16" /* CMPXCHG16B Instruction */
"\017xTPR" /* Send Task Priority Messages*/
- "\020<b15>"
+ "\020PDCM" /* Perf/Debug Capability MSR */
"\021<b16>"
"\022<b17>"
"\023DCA" /* Direct Cache Access */
@@ -342,13 +342,8 @@
}
if (cpu_feature & CPUID_HTT && strcmp(cpu_vendor,
- "AuthenticAMD") == 0) {
+ "AuthenticAMD") == 0)
cpu_feature &= ~CPUID_HTT;
- if (bootverbose)
- printf("\nHTT bit cleared - FreeBSD"
- " does not have licensing issues"
- " requiring it.\n");
- }
/*
* If this CPU supports HTT or CMP then mention the
==== //depot/projects/soc2006/intr_filter/amd64/amd64/intr_machdep.c#30 (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.31 2007/05/06 17:02:49 piso Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.33 2007/05/31 19:25:34 piso Exp $
*/
/*
@@ -43,13 +43,14 @@
#include <sys/param.h>
#include <sys/bus.h>
#include <sys/interrupt.h>
-#include <sys/lock.h>
#include <sys/ktr.h>
#include <sys/kernel.h>
+#include <sys/lock.h>
#include <sys/mutex.h>
#include <sys/proc.h>
#include <sys/syslog.h>
#include <sys/systm.h>
+#include <sys/sx.h>
#include <machine/clock.h>
#include <machine/intr_machdep.h>
#include <machine/smp.h>
@@ -71,7 +72,8 @@
static int intrcnt_index;
static struct intsrc *interrupt_sources[NUM_IO_INTS];
-static struct mtx intr_table_lock;
+static struct sx intr_table_lock;
+static struct mtx intrcnt_lock;
static STAILQ_HEAD(, pic) pics;
#ifdef INTR_FILTER
@@ -115,14 +117,14 @@
{
int error;
- mtx_lock_spin(&intr_table_lock);
+ sx_xlock(&intr_table_lock);
if (intr_pic_registered(pic))
error = EBUSY;
else {
STAILQ_INSERT_TAIL(&pics, pic, pics);
error = 0;
}
- mtx_unlock_spin(&intr_table_lock);
+ sx_xunlock(&intr_table_lock);
return (error);
}
@@ -150,16 +152,16 @@
#endif
if (error)
return (error);
- mtx_lock_spin(&intr_table_lock);
+ sx_xlock(&intr_table_lock);
if (interrupt_sources[vector] != NULL) {
- mtx_unlock_spin(&intr_table_lock);
+ sx_xunlock(&intr_table_lock);
intr_event_destroy(isrc->is_event);
return (EEXIST);
}
intrcnt_register(isrc);
interrupt_sources[vector] = isrc;
- isrc->is_enabled = 0;
- mtx_unlock_spin(&intr_table_lock);
+ isrc->is_handlers = 0;
+ sx_xunlock(&intr_table_lock);
return (0);
}
@@ -183,19 +185,18 @@
error = intr_event_add_handler(isrc->is_event, name, filter, handler,
arg, intr_priority(flags), flags, cookiep);
if (error == 0) {
+ sx_xlock(&intr_table_lock);
intrcnt_updatename(isrc);
- mtx_lock_spin(&intr_table_lock);
- if (!isrc->is_enabled) {
- isrc->is_enabled = 1;
+ isrc->is_handlers++;
+ if (isrc->is_handlers == 1) {
#ifdef SMP
if (assign_cpu)
intr_assign_next_cpu(isrc);
#endif
- mtx_unlock_spin(&intr_table_lock);
isrc->is_pic->pic_enable_intr(isrc);
- } else
- mtx_unlock_spin(&intr_table_lock);
- isrc->is_pic->pic_enable_source(isrc);
+ isrc->is_pic->pic_enable_source(isrc);
+ }
+ sx_xunlock(&intr_table_lock);
}
return (error);
}
@@ -208,8 +209,16 @@
isrc = intr_handler_source(cookie);
error = intr_event_remove_handler(cookie);
- if (error == 0)
+ if (error == 0) {
+ sx_xlock(&intr_table_lock);
+ isrc->is_handlers--;
+ if (isrc->is_handlers == 0) {
+ isrc->is_pic->pic_disable_source(isrc, PIC_NO_EOI);
+ isrc->is_pic->pic_disable_intr(isrc);
+ }
intrcnt_updatename(isrc);
+ sx_xunlock(&intr_table_lock);
+ }
return (error);
}
@@ -301,7 +310,7 @@
struct thread *td;
struct intr_event *ie;
struct intr_handler *ih;
- int error, vector, thread;
+ int error, vector, thread, ret;
td = curthread;
@@ -347,6 +356,7 @@
* a trapframe as its argument.
*/
td->td_intr_nesting_level++;
+ ret = 0;
thread = 0;
critical_enter();
TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) {
@@ -358,9 +368,17 @@
ih->ih_filter, ih->ih_argument == NULL ? frame :
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list