PERFORCE change 165309 for review
Marko Zec
zec at FreeBSD.org
Sat Jun 27 14:31:16 UTC 2009
http://perforce.freebsd.org/chv.cgi?CH=165309
Change 165309 by zec at zec_amdx4 on 2009/06/27 14:30:23
IFC @ 165304
Affected files ...
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/intr_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/io_apic.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/amd64/msi.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/intr_machdep.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/amd64/include/vm.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/amd64/isa/clock.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/elf_machdep.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/pmap.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/arm/vm_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/at91_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/at91/if_ate.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/CAMBRIA.hints#6 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-78XXX#6 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F5XXX#6 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/conf/DB-88F6XXX#6 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/include/vm.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/discovery/discovery.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/files.mv#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/kirkwood/kirkwood.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mv_sata.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mvreg.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/mvwin.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/mv/orion/orion.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/sa11x0/assabet_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/i80321/ep80219_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/i80321/iq31244_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/i8134x/crb_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_ata.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/avila_machdep.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/cambria_exp_space.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/if_npe.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/ixp425/ixp425.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/arm/xscale/pxa/pxa_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/boot/i386/libi386/biosdisk.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/cam/scsi/scsi_target.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_ipc.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_misc.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_proto.h#17 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscall.h#17 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_syscalls.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/freebsd32_sysent.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/freebsd32/syscalls.master#17 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linprocfs/linprocfs.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ioctl.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/linux/linux_ipc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/ndis/subr_usbd.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_ipc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/compat/svr4/svr4_sockio.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/NOTES#33 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files#46 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files.amd64#13 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/files.i386#20 integrate
.. //depot/projects/vimage-commit2/src/sys/conf/kmod.mk#5 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/altq/altq/altq_subr.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/ngatm/netnatm/sig/sig_uni.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_if.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/pf/net/pf_ioctl.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_addr.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/contrib/rdma/rdma_cma.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_hp.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_wmi.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/acpi_support/acpi_wmi_if.m#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/ae/if_ae.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/age/if_age.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/alc/if_alc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ale/if_ale.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/asmc/asmc.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/asmc/asmcvar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-all.h#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-dma.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-pci.h#16 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/ata-sata.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acard.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-acerlabs.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-adaptec.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-amd.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ati.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-cenatek.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-cypress.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-cyrix.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-highpoint.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-intel.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-ite.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-jmicron.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-marvell.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-micron.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-national.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-netcell.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-nvidia.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-promise.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-serverworks.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-siliconimage.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-sis.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ata/chipsets/ata-via.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ath/if_ath.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bce.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bce/if_bcereg.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bfe/if_bfe.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bge/if_bge.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/bm/if_bm.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cas/if_cas.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cas/if_casvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cpuctl/cpuctl.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cs/if_cs.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_adapter.h#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_main.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/cxgb_sge.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/sys/mvec.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/sys/uipc_mvec.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/cxgb/ulp/iw_cxgb/iw_cxgb.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/dc/if_dc.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/de/if_de.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drmP.h#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_drv.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_irq.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/drm_sysctl.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_dma.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_drv.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/i915_irq.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_cp.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/drm/radeon_irq.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82540.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82541.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82571.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82575.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_82575.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_api.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_defines.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_hw.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_ich8lan.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_ich8lan.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_mac.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_osdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_phy.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_phy.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/e1000_regs.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_em.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/e1000/if_igb.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ed/if_ed.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/et/if_et.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ex/if_ex.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/fe/if_fe.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/fxp/if_fxp.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/gem/if_gem.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/gem/if_gem_sbus.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/dev/gem/if_gemreg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/gem/if_gemvar.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hme/if_hme.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hptmv/atapi.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_logging.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/hwpmc/hwpmc_mod.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ie/if_ie.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/if_ndis/if_ndis.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/iscsi/initiator/isc_soc.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgb/if_ixgb.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_82598.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_82599.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_api.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_api.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_common.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_osdep.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_phy.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_phy.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ixgbe/ixgbe_type.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/jme/if_jme.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/le/lance.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/lge/if_lge.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/malo/if_malo.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/md/md.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mfi/mfi.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mge/if_mge.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mpt/mpt_cam.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/msk/if_msk.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mxge/eth_z8e.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mxge/ethp_z8e.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mxge/if_mxge_var.h#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mxge/mxge_lro.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_eth_z8e.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/mxge/rss_ethp_z8e.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/my/if_my.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/nfe/if_nfe.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/nge/if_nge.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/nve/if_nve.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/nxge/if_nxge.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/pcn/if_pcn.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/pdq/pdq_ifsubr.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/re/if_re.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sf/if_sf.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sis/if_sis.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sk/if_sk.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sn/if_sn.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/snc/dp83932.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/midi/midi.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/midi/sequencer.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pci/hda/hdac.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/sound/pcm/feeder_rate.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/speaker/spkr.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ste/if_ste.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/stge/if_stge.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/ti/if_ti.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/tl/if_tl.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/tsec/if_tsec.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/tx/if_tx.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/txp/if_txp.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_aue.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_axe.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_cue.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_kue.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_rue.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/net/if_udav.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/storage/umass.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdevs#28 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdi.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/usbdi_util.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_upgt.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_urtw.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/usb/wlan/if_zyd.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/vge/if_vge.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/vr/if_vr.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wb/if_wb.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wi/if_wi.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/wl/if_wl.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/xe/if_xe.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/dev/xl/if_xl.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_psdev.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/coda/coda_vnops.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/nfsclient/nfs_clvnops.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/procfs/procfs_map.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/pseudofs/pseudofs_vnops.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/fs/tmpfs/tmpfs_subr.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/geom_redboot.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/geom/linux_lvm/g_linux_lvm.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_ioctl.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_iops.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/FreeBSD/xfs_vnode.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/xfs_rw.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/gnu/fs/xfs/xfs_vnodeops.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/conf/NOTES#17 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/elf_machdep.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/intr_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/io_apic.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/local_apic.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/machdep.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/mp_machdep.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/i386/msi.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/ibcs2/ibcs2_ipc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/intr_machdep.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/include/vm.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/i386/isa/clock.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/linux/linux_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/i386/xen/mp_machdep.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/ia64/elf_machdep.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/ia64/machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/ia64/mp_machdep.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/ia64/include/vm.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/kern/init_sysent.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_cpuset.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_descrip.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_fork.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_intr.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_jail.c#28 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_lockf.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_mbuf.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_poll.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_resource.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_sig.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_switch.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_uuid.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/kern_vimage.c#56 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/link_elf.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/link_elf_obj.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/makesyscalls.sh#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sched_ule.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_pcpu.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/subr_stack.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sys_process.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/syscalls.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/syscalls.master#9 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/systrace_args.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sysv_ipc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sysv_msg.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sysv_sem.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/sysv_shm.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/tty.c#28 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_shm.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/kern/uipc_usrreq.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/adm5120/if_admsw.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/include/vm.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/mips/mips/elf_machdep.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/mp_machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/mips/mips/pmap.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/acpi/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_hp/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/acpi/acpi_wmi/Makefile#1 branch
.. //depot/projects/vimage-commit2/src/sys/modules/gem/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/igb/Makefile#4 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/ixgbe/Makefile#4 integrate
.. //depot/projects/vimage-commit2/src/sys/modules/mxge/mxge/Makefile#2 integrate
.. //depot/projects/vimage-commit2/src/sys/net/bridgestp.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if.c#79 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_ef.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_epair.c#1 branch
.. //depot/projects/vimage-commit2/src/sys/net/if_ethersubr.c#31 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_fddisubr.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_media.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_mib.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_spppsubr.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_stf.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_tap.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_tun.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_var.h#34 integrate
.. //depot/projects/vimage-commit2/src/sys/net/if_vlan.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/net/netisr.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/net/raw_cb.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/net/raw_usrreq.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/net/route.c#45 integrate
.. //depot/projects/vimage-commit2/src/sys/net/rtsock.c#32 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/net80211/ieee80211_ddb.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netatalk/aarp.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netatalk/at_control.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netatalk/at_extern.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netatalk/at_rmx.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netatalk/at_var.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_input.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_output.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_pcb.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netatalk/ddp_usrreq.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/atm/ng_atm.c#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/atm/uni/ng_uni.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_eiface.c#28 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_ether.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netgraph/ng_iface.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/if_ether.c#38 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/igmp.c#43 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in.c#31 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_gif.c#15 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_mcast.c#25 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.c#44 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_pcb.h#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_rmx.c#34 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/in_var.h#12 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_carp.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_divert.c#32 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_dummynet.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_icmp.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_input.c#47 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_mroute.c#19 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_options.c#14 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ip_output.c#34 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_dummynet.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw2.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/ipfw/ip_fw_nat.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/raw_ip.c#34 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_hostcache.c#29 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_input.c#40 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_offload.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet/tcp_usrreq.c#22 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/frag6.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/icmp6.c#31 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_ifattach.c#32 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.c#22 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_pcb.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_rmx.c#35 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_src.c#21 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/in6_var.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_input.c#36 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_mroute.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_output.c#18 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/ip6_var.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/mld6.c#25 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6.c#38 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_nbr.c#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/nd6_rtr.c#29 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/raw_ip6.c#28 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/scope6.c#16 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/udp6_usrreq.c#24 integrate
.. //depot/projects/vimage-commit2/src/sys/netinet6/vinet6.h#26 integrate
.. //depot/projects/vimage-commit2/src/sys/netipsec/key.c#35 integrate
.. //depot/projects/vimage-commit2/src/sys/netipx/ipx.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netipx/ipx_if.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/netipx/ipx_input.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/netipx/ipx_outputfl.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/netipx/ipx_pcb.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_diskless.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/nfsclient/nfs_vnops.c#23 integrate
.. //depot/projects/vimage-commit2/src/sys/pc98/include/vm.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/pc98/pc98/machdep.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/pci/if_rl.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/aim/mmu_oea64.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/booke/pmap.c#13 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/conf/MPC85XX#8 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/include/vm.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/powerpc/mpc85xx/ds1553_bus_lbc.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/elf_machdep.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/powerpc/powerpc/mp_machdep.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/clnt_rc.c#7 integrate
.. //depot/projects/vimage-commit2/src/sys/rpc/rpcsec_gss/rpcsec_gss.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/security/mac_biba/mac_biba.c#20 integrate
.. //depot/projects/vimage-commit2/src/sys/security/mac_lomac/mac_lomac.c#17 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/conf/GENERIC#15 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/pcpu.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/include/vm.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/elf_machdep.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/machdep.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/mp_machdep.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/sparc64/sparc64/pmap.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/conf/GENERIC#9 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/include/pcpu.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/include/vm.h#1 branch
.. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/machdep.c#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/mp_machdep.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sun4v/sun4v/pmap.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/acl.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/ata.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/conf.h#11 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/ipc.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/jail.h#14 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/linker.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/msg.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/param.h#48 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/pcpu.h#6 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/priv.h#13 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/resource.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/resourcevar.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/sched.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/sem.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/shm.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/stack.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/syscall.h#9 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/syscall.mk#9 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/sysctl.h#23 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/sysproto.h#9 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/tty.h#9 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/uio.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/unistd.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/sys/vnode.h#16 integrate
.. //depot/projects/vimage-commit2/src/sys/ufs/ufs/ufs_dirhash.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/default_pager.c#2 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/device_pager.c#5 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/phys_pager.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/swap_pager.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_contig.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_extern.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_fault.c#8 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_kern.c#6 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_map.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_map.h#5 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_mmap.c#11 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_object.c#9 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_object.h#4 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_pageout.c#10 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_pager.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_pager.h#3 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_phys.c#3 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vm_phys.h#2 integrate
.. //depot/projects/vimage-commit2/src/sys/vm/vnode_pager.c#12 integrate
Differences ...
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/intr_machdep.c#3 (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.42 2008/12/02 14:19:53 ganbold Exp $
+ * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.44 2009/06/25 20:35:46 jhb Exp $
*/
/*
@@ -51,7 +51,6 @@
#include <sys/smp.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>
@@ -73,14 +72,12 @@
static int intrcnt_index;
static struct intsrc *interrupt_sources[NUM_IO_INTS];
-static struct sx intr_table_lock;
+static struct mtx intr_table_lock;
static struct mtx intrcnt_lock;
static STAILQ_HEAD(, pic) pics;
#ifdef SMP
static int assign_cpu;
-
-static void intr_assign_next_cpu(struct intsrc *isrc);
#endif
static int intr_assign_cpu(void *arg, u_char cpu);
@@ -114,14 +111,14 @@
{
int error;
- sx_xlock(&intr_table_lock);
+ mtx_lock(&intr_table_lock);
if (intr_pic_registered(pic))
error = EBUSY;
else {
STAILQ_INSERT_TAIL(&pics, pic, pics);
error = 0;
}
- sx_xunlock(&intr_table_lock);
+ mtx_unlock(&intr_table_lock);
return (error);
}
@@ -145,16 +142,16 @@
vector);
if (error)
return (error);
- sx_xlock(&intr_table_lock);
+ mtx_lock(&intr_table_lock);
if (interrupt_sources[vector] != NULL) {
- sx_xunlock(&intr_table_lock);
+ mtx_unlock(&intr_table_lock);
intr_event_destroy(isrc->is_event);
return (EEXIST);
}
intrcnt_register(isrc);
interrupt_sources[vector] = isrc;
isrc->is_handlers = 0;
- sx_xunlock(&intr_table_lock);
+ mtx_unlock(&intr_table_lock);
return (0);
}
@@ -178,18 +175,14 @@
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);
+ mtx_lock(&intr_table_lock);
intrcnt_updatename(isrc);
isrc->is_handlers++;
if (isrc->is_handlers == 1) {
-#ifdef SMP
- if (assign_cpu)
- intr_assign_next_cpu(isrc);
-#endif
isrc->is_pic->pic_enable_intr(isrc);
isrc->is_pic->pic_enable_source(isrc);
}
- sx_xunlock(&intr_table_lock);
+ mtx_unlock(&intr_table_lock);
}
return (error);
}
@@ -203,14 +196,14 @@
isrc = intr_handler_source(cookie);
error = intr_event_remove_handler(cookie);
if (error == 0) {
- sx_xlock(&intr_table_lock);
+ mtx_lock(&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);
+ mtx_unlock(&intr_table_lock);
}
return (error);
}
@@ -284,12 +277,12 @@
#ifndef DEV_ATPIC
atpic_reset();
#endif
- sx_xlock(&intr_table_lock);
+ mtx_lock(&intr_table_lock);
STAILQ_FOREACH(pic, &pics, pics) {
if (pic->pic_resume != NULL)
pic->pic_resume(pic);
}
- sx_xunlock(&intr_table_lock);
+ mtx_unlock(&intr_table_lock);
}
void
@@ -297,12 +290,12 @@
{
struct pic *pic;
- sx_xlock(&intr_table_lock);
+ mtx_lock(&intr_table_lock);
STAILQ_FOREACH(pic, &pics, pics) {
if (pic->pic_suspend != NULL)
pic->pic_suspend(pic);
}
- sx_xunlock(&intr_table_lock);
+ mtx_unlock(&intr_table_lock);
}
static int
@@ -317,9 +310,9 @@
*/
if (assign_cpu && cpu != NOCPU) {
isrc = arg;
- sx_xlock(&intr_table_lock);
+ mtx_lock(&intr_table_lock);
isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[cpu]);
- sx_xunlock(&intr_table_lock);
+ mtx_unlock(&intr_table_lock);
}
return (0);
#else
@@ -378,7 +371,7 @@
intrcnt_setname("???", 0);
intrcnt_index = 1;
STAILQ_INIT(&pics);
- sx_init(&intr_table_lock, "intr sources");
+ mtx_init(&intr_table_lock, "intr sources", NULL, MTX_DEF | MTX_RECURSE);
mtx_init(&intrcnt_lock, "intrcnt", NULL, MTX_SPIN);
}
SYSINIT(intr_init, SI_SUB_INTR, SI_ORDER_FIRST, intr_init, NULL);
@@ -435,19 +428,28 @@
static cpumask_t intr_cpus = (1 << 0);
static int current_cpu;
-static void
-intr_assign_next_cpu(struct intsrc *isrc)
+/*
+ * Return the CPU that the next interrupt source should use. For now
+ * this just returns the next local APIC according to round-robin.
+ */
+u_int
+intr_next_cpu(void)
{
+ u_int apic_id;
- /*
- * Assign this source to a local APIC in a round-robin fashion.
- */
- isrc->is_pic->pic_assign_cpu(isrc, cpu_apic_ids[current_cpu]);
+ /* Leave all interrupts on the BSP during boot. */
+ if (!assign_cpu)
+ return (cpu_apic_ids[0]);
+
+ mtx_lock(&intr_table_lock);
+ apic_id = cpu_apic_ids[current_cpu];
do {
current_cpu++;
if (current_cpu > mp_maxid)
current_cpu = 0;
} while (!(intr_cpus & (1 << current_cpu)));
+ mtx_unlock(&intr_table_lock);
+ return (apic_id);
}
/* Attempt to bind the specified IRQ to the specified CPU. */
@@ -487,6 +489,7 @@
intr_shuffle_irqs(void *arg __unused)
{
struct intsrc *isrc;
+ u_int apic_id;
int i;
/* Don't bother on UP. */
@@ -494,7 +497,7 @@
return;
/* Round-robin assign a CPU to each enabled source. */
- sx_xlock(&intr_table_lock);
+ mtx_lock(&intr_table_lock);
assign_cpu = 1;
for (i = 0; i < NUM_IO_INTS; i++) {
isrc = interrupt_sources[i];
@@ -505,14 +508,24 @@
* of picking one via round-robin.
*/
if (isrc->is_event->ie_cpu != NOCPU)
- isrc->is_pic->pic_assign_cpu(isrc,
- cpu_apic_ids[isrc->is_event->ie_cpu]);
+ apic_id = isrc->is_event->ie_cpu;
else
- intr_assign_next_cpu(isrc);
+ apic_id = intr_next_cpu();
+ isrc->is_pic->pic_assign_cpu(isrc, apic_id);
}
}
- sx_xunlock(&intr_table_lock);
+ mtx_unlock(&intr_table_lock);
}
SYSINIT(intr_shuffle_irqs, SI_SUB_SMP, SI_ORDER_SECOND, intr_shuffle_irqs,
NULL);
+#else
+/*
+ * Always route interrupts to the current processor in the UP case.
+ */
+u_int
+intr_next_cpu(void)
+{
+
+ return (PCPU_GET(apic_id));
+}
#endif
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/io_apic.c#3 (text+ko) ====
@@ -28,7 +28,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.32 2009/01/29 09:22:56 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/io_apic.c,v 1.33 2009/06/25 18:13:46 jhb Exp $");
#include "opt_isa.h"
@@ -372,7 +372,7 @@
struct ioapic_intsrc *intpin = (struct ioapic_intsrc *)isrc;
if (intpin->io_vector == 0)
- ioapic_assign_cpu(isrc, pcpu_find(0)->pc_apic_id);
+ ioapic_assign_cpu(isrc, intr_next_cpu());
apic_enable_vector(intpin->io_cpu, intpin->io_vector);
}
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/local_apic.c#10 (text+ko) ====
@@ -32,7 +32,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.56 2009/06/09 04:17:36 ariff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.57 2009/06/24 19:16:48 jhb Exp $");
#include "opt_hwpmc_hooks.h"
#include "opt_kdtrace.h"
@@ -897,6 +897,7 @@
apic_free_vector(u_int apic_id, u_int vector, u_int irq)
{
struct thread *td;
+
KASSERT(vector >= APIC_IO_INTS && vector != IDT_SYSCALL &&
vector <= APIC_IO_INTS + APIC_NUM_IOINTS,
("Vector %u does not map to an IRQ line", vector));
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/machdep.c#12 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.702 2009/06/09 04:17:36 ariff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/machdep.c,v 1.703 2009/06/23 22:42:39 jeff Exp $");
#include "opt_atalk.h"
#include "opt_atpic.h"
@@ -1501,6 +1501,8 @@
wrmsr(MSR_KGSBASE, 0); /* User value while in the kernel */
pcpu_init(pc, 0, sizeof(struct pcpu));
+ dpcpu_init((void *)(physfree + KERNBASE), 0);
+ physfree += DPCPU_SIZE;
PCPU_SET(prvspace, pc);
PCPU_SET(curthread, &thread0);
PCPU_SET(curpcb, thread0.td_pcb);
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/mp_machdep.c#16 (text+ko) ====
@@ -25,7 +25,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.308 2009/05/14 17:43:00 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/mp_machdep.c,v 1.309 2009/06/23 22:42:39 jeff Exp $");
#include "opt_cpu.h"
#include "opt_kstack_pages.h"
@@ -93,9 +93,10 @@
/* Free these after use */
void *bootstacks[MAXCPU];
-/* Temporary holder for double fault stack */
+/* Temporary variables for init_secondary() */
char *doublefault_stack;
char *nmi_stack;
+void *dpcpu;
/* Hotwire a 0->4MB V==P mapping */
extern pt_entry_t *KPTphys;
@@ -590,6 +591,7 @@
/* prime data page for it to use */
pcpu_init(pc, cpu, sizeof(struct pcpu));
+ dpcpu_init(dpcpu, cpu);
pc->pc_apic_id = cpu_apic_ids[cpu];
pc->pc_prvspace = pc;
pc->pc_curthread = 0;
@@ -885,6 +887,7 @@
bootstacks[cpu] = (void *)kmem_alloc(kernel_map, KSTACK_PAGES * PAGE_SIZE);
doublefault_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE);
nmi_stack = (char *)kmem_alloc(kernel_map, PAGE_SIZE);
+ dpcpu = (void *)kmem_alloc(kernel_map, DPCPU_SIZE);
bootSTK = (char *)bootstacks[cpu] + KSTACK_PAGES * PAGE_SIZE - 8;
bootAP = cpu;
==== //depot/projects/vimage-commit2/src/sys/amd64/amd64/msi.c#5 (text+ko) ====
@@ -35,7 +35,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.11 2009/06/15 13:47:49 mav Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/msi.c,v 1.12 2009/06/25 18:13:46 jhb Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -161,8 +161,6 @@
{
struct msi_intsrc *msi = (struct msi_intsrc *)isrc;
- if (msi->msi_vector == 0)
- msi_assign_cpu(isrc, 0);
apic_enable_vector(msi->msi_cpu, msi->msi_vector);
}
@@ -208,10 +206,11 @@
/* Store information to free existing irq. */
old_vector = msi->msi_vector;
old_id = msi->msi_cpu;
- if (old_vector && old_id == apic_id)
+ if (old_id == apic_id)
return;
- if (old_vector && !msi->msi_msix && msi->msi_first->msi_count > 1)
+ if (!msi->msi_msix && msi->msi_first->msi_count > 1)
return;
+
/* Allocate IDT vector on this cpu. */
vector = apic_alloc_vector(apic_id, msi->msi_irq);
if (vector == 0)
@@ -223,15 +222,14 @@
msi->msi_msix ? "MSI-X" : "MSI", msi->msi_irq,
msi->msi_cpu, msi->msi_vector);
pci_remap_msi_irq(msi->msi_dev, msi->msi_irq);
+
/*
* Free the old vector after the new one is established. This is done
* to prevent races where we could miss an interrupt.
*/
- if (old_vector)
- apic_free_vector(old_id, old_vector, msi->msi_irq);
+ apic_free_vector(old_id, old_vector, msi->msi_irq);
}
-
void
msi_init(void)
{
@@ -287,7 +285,8 @@
msi_alloc(device_t dev, int count, int maxcount, int *irqs)
{
struct msi_intsrc *msi, *fsrc;
- int cnt, i;
+ u_int cpu;
+ int cnt, i, vector;
if (!msi_enabled)
return (ENXIO);
@@ -333,12 +332,25 @@
/* Ok, we now have the IRQs allocated. */
KASSERT(cnt == count, ("count mismatch"));
+ /* Allocate 'count' IDT vectors. */
+ cpu = intr_next_cpu();
+ vector = apic_alloc_vectors(cpu, irqs, count, maxcount);
+ if (vector == 0) {
+ mtx_unlock(&msi_lock);
+ return (ENOSPC);
+ }
+
/* Assign IDT vectors and make these messages owned by 'dev'. */
fsrc = (struct msi_intsrc *)intr_lookup_source(irqs[0]);
for (i = 0; i < count; i++) {
msi = (struct msi_intsrc *)intr_lookup_source(irqs[i]);
+ msi->msi_cpu = cpu;
msi->msi_dev = dev;
- msi->msi_vector = 0;
+ msi->msi_vector = vector + i;
+ if (bootverbose)
+ printf(
+ "msi: routing MSI IRQ %d to local APIC %u vector %u\n",
+ msi->msi_irq, msi->msi_cpu, msi->msi_vector);
msi->msi_first = fsrc;
KASSERT(msi->msi_intsrc.is_handlers == 0,
("dead MSI has handlers"));
@@ -391,18 +403,14 @@
KASSERT(msi->msi_dev == first->msi_dev, ("owner mismatch"));
msi->msi_first = NULL;
msi->msi_dev = NULL;
- if (msi->msi_vector)
- apic_free_vector(msi->msi_cpu, msi->msi_vector,
- msi->msi_irq);
+ apic_free_vector(msi->msi_cpu, msi->msi_vector, msi->msi_irq);
msi->msi_vector = 0;
}
/* Clear out the first message. */
first->msi_first = NULL;
first->msi_dev = NULL;
- if (first->msi_vector)
- apic_free_vector(first->msi_cpu, first->msi_vector,
- first->msi_irq);
+ apic_free_vector(first->msi_cpu, first->msi_vector, first->msi_irq);
first->msi_vector = 0;
first->msi_count = 0;
@@ -451,7 +459,8 @@
msix_alloc(device_t dev, int *irq)
{
struct msi_intsrc *msi;
- int i;
+ u_int cpu;
+ int i, vector;
if (!msi_enabled)
return (ENXIO);
@@ -486,9 +495,17 @@
goto again;
}
+ /* Allocate an IDT vector. */
+ cpu = intr_next_cpu();
+ vector = apic_alloc_vector(cpu, i);
+ if (bootverbose)
+ printf("msi: routing MSI-X IRQ %d to local APIC %u vector %u\n",
+ msi->msi_irq, cpu, vector);
+
/* Setup source. */
+ msi->msi_cpu = cpu;
msi->msi_dev = dev;
- msi->msi_vector = 0;
+ msi->msi_vector = vector;
msi->msi_msix = 1;
KASSERT(msi->msi_intsrc.is_handlers == 0, ("dead MSI-X has handlers"));
@@ -520,8 +537,7 @@
/* Clear out the message. */
msi->msi_dev = NULL;
- if (msi->msi_vector)
- apic_free_vector(msi->msi_cpu, msi->msi_vector, msi->msi_irq);
+ apic_free_vector(msi->msi_cpu, msi->msi_vector, msi->msi_irq);
msi->msi_vector = 0;
msi->msi_msix = 0;
==== //depot/projects/vimage-commit2/src/sys/amd64/include/intr_machdep.h#3 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.21 2009/02/03 09:01:45 jkoshy Exp $
+ * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.23 2009/06/25 20:35:46 jhb Exp $
*/
#ifndef __MACHINE_INTR_MACHDEP_H__
@@ -152,6 +152,7 @@
int intr_config_intr(int vector, enum intr_trigger trig,
enum intr_polarity pol);
void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame);
+u_int intr_next_cpu(void);
struct intsrc *intr_lookup_source(int vector);
int intr_register_pic(struct pic *pic);
int intr_register_source(struct intsrc *isrc);
==== //depot/projects/vimage-commit2/src/sys/amd64/isa/clock.c#6 (text+ko) ====
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list