Date: Fri, 23 Feb 2007 17:53:34 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 114889 for review Message-ID: <200702231753.l1NHrY93053400@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=114889 Change 114889 by jhb@jhb_mutex on 2007/02/23 17:53:09 IFC @114882. Affected files ... .. //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#23 integrate .. //depot/projects/smpng/sys/amd64/amd64/nexus.c#23 integrate .. //depot/projects/smpng/sys/amd64/include/intr_machdep.h#13 integrate .. //depot/projects/smpng/sys/amd64/isa/clock.c#21 integrate .. //depot/projects/smpng/sys/amd64/isa/isa.c#7 integrate .. //depot/projects/smpng/sys/arm/arm/intr.c#14 integrate .. //depot/projects/smpng/sys/arm/arm/nexus.c#10 integrate .. //depot/projects/smpng/sys/arm/at91/at91.c#8 integrate .. //depot/projects/smpng/sys/arm/at91/at91_mci.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/at91_pio.c#5 integrate .. //depot/projects/smpng/sys/arm/at91/at91_rtc.c#3 integrate .. //depot/projects/smpng/sys/arm/at91/at91_spi.c#5 integrate .. //depot/projects/smpng/sys/arm/at91/at91_ssc.c#4 integrate .. //depot/projects/smpng/sys/arm/at91/at91_st.c#8 integrate .. //depot/projects/smpng/sys/arm/at91/at91_twi.c#8 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#13 integrate .. //depot/projects/smpng/sys/arm/include/intr.h#6 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0.c#8 integrate .. //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#6 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_pci.c#10 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/i80321_timer.c#11 integrate .. //depot/projects/smpng/sys/arm/xscale/i80321/iq80321.c#13 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#41 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.h#4 integrate .. //depot/projects/smpng/sys/compat/ndis/kern_ndis.c#35 integrate .. //depot/projects/smpng/sys/contrib/dev/oltr/if_oltr.c#18 integrate .. //depot/projects/smpng/sys/dev/aac/aac.c#57 integrate .. //depot/projects/smpng/sys/dev/aac/aacvar.h#26 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdInterrupt.c#16 integrate .. //depot/projects/smpng/sys/dev/acpica/Osd/OsdSchedule.c#30 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#97 integrate .. //depot/projects/smpng/sys/dev/adlink/adlink.c#13 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_eisa.c#11 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_isa.c#12 integrate .. //depot/projects/smpng/sys/dev/advansys/adv_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/advansys/adwcam.c#16 integrate .. //depot/projects/smpng/sys/dev/aha/aha_isa.c#17 integrate .. //depot/projects/smpng/sys/dev/aha/aha_mca.c#12 integrate .. //depot/projects/smpng/sys/dev/ahb/ahb.c#17 integrate .. //depot/projects/smpng/sys/dev/aic/aic_cbus.c#6 integrate .. //depot/projects/smpng/sys/dev/aic/aic_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/aic/aic_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic79xx_osm.c#24 integrate .. //depot/projects/smpng/sys/dev/aic7xxx/aic7xxx_osm.c#21 integrate .. //depot/projects/smpng/sys/dev/amd/amd.c#19 integrate .. //depot/projects/smpng/sys/dev/amr/amr_pci.c#28 integrate .. //depot/projects/smpng/sys/dev/an/if_an_isa.c#13 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pccard.c#18 integrate .. //depot/projects/smpng/sys/dev/an/if_an_pci.c#18 integrate .. //depot/projects/smpng/sys/dev/ar/if_ar.c#21 integrate .. //depot/projects/smpng/sys/dev/arcmsr/arcmsr.c#12 integrate .. //depot/projects/smpng/sys/dev/arl/if_arl_isa.c#8 integrate .. //depot/projects/smpng/sys/dev/asr/asr.c#36 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.c#87 integrate .. //depot/projects/smpng/sys/dev/ata/ata-all.h#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-card.c#30 integrate .. //depot/projects/smpng/sys/dev/ata/ata-cbus.c#17 integrate .. //depot/projects/smpng/sys/dev/ata/ata-chipset.c#77 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.c#62 integrate .. //depot/projects/smpng/sys/dev/ata/ata-disk.h#18 integrate .. //depot/projects/smpng/sys/dev/ata/ata-dma.c#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-isa.c#23 integrate .. //depot/projects/smpng/sys/dev/ata/ata-lowlevel.c#36 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.c#65 integrate .. //depot/projects/smpng/sys/dev/ata/ata-pci.h#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-queue.c#39 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.c#50 integrate .. //depot/projects/smpng/sys/dev/ata/ata-raid.h#29 integrate .. //depot/projects/smpng/sys/dev/ata/ata-usb.c#5 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.c#66 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-cd.h#17 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.c#35 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-fd.h#14 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.c#35 integrate .. //depot/projects/smpng/sys/dev/ata/atapi-tape.h#11 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate .. //depot/projects/smpng/sys/dev/atkbdc/psm.c#7 integrate .. //depot/projects/smpng/sys/dev/awi/if_awi_pccard.c#18 integrate .. //depot/projects/smpng/sys/dev/bce/if_bce.c#14 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#26 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#88 integrate .. //depot/projects/smpng/sys/dev/bktr/bktr_os.c#28 integrate .. //depot/projects/smpng/sys/dev/buslogic/bt.c#17 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#6 integrate .. //depot/projects/smpng/sys/dev/ciss/ciss.c#50 integrate .. //depot/projects/smpng/sys/dev/cm/if_cm_isa.c#10 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#19 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs_pccard.c#14 integrate .. //depot/projects/smpng/sys/dev/ct/ct_isa.c#12 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#21 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#28 integrate .. //depot/projects/smpng/sys/dev/cy/cy.c#9 integrate .. //depot/projects/smpng/sys/dev/cy/cy_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/cy/cy_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/cy/cyvar.h#2 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#14 integrate .. //depot/projects/smpng/sys/dev/de/if_de.c#4 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_eisa.c#10 integrate .. //depot/projects/smpng/sys/dev/dpt/dpt_pci.c#13 integrate .. //depot/projects/smpng/sys/dev/drm/drm_irq.c#3 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_cbus.c#18 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_isa.c#17 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pccard.c#38 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/em/if_em.c#79 integrate .. //depot/projects/smpng/sys/dev/en/if_en_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_eisa.c#13 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_isa.c#14 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_mca.c#10 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep_pccard.c#22 integrate .. //depot/projects/smpng/sys/dev/esp/esp_sbus.c#10 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_isa.c#7 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex_pccard.c#13 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#18 integrate .. //depot/projects/smpng/sys/dev/fdc/fdc.c#27 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#25 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#38 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#80 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm.c#20 integrate .. //depot/projects/smpng/sys/dev/hfa/hfa_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/hifn/hifn7751.c#24 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_pci.c#20 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme_sbus.c#14 integrate .. //depot/projects/smpng/sys/dev/hptmv/entry.c#12 integrate .. //depot/projects/smpng/sys/dev/ichsmb/ichsmb.c#14 integrate .. //depot/projects/smpng/sys/dev/ida/ida_eisa.c#13 integrate .. //depot/projects/smpng/sys/dev/ida/ida_pci.c#15 integrate .. //depot/projects/smpng/sys/dev/idt/idt_pci.c#7 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie_isa.c#6 integrate .. //depot/projects/smpng/sys/dev/iir/iir_pci.c#17 integrate .. //depot/projects/smpng/sys/dev/ipmi/ipmi.c#7 integrate .. //depot/projects/smpng/sys/dev/ips/ips_pci.c#12 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#13 integrate .. //depot/projects/smpng/sys/dev/isp/isp.c#53 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#52 integrate .. //depot/projects/smpng/sys/dev/isp/isp_pci.c#50 integrate .. //depot/projects/smpng/sys/dev/isp/isp_sbus.c#21 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#25 integrate .. //depot/projects/smpng/sys/dev/ixgb/if_ixgb.c#18 integrate .. //depot/projects/smpng/sys/dev/le/if_le_cbus.c#3 integrate .. //depot/projects/smpng/sys/dev/le/if_le_isa.c#3 integrate .. //depot/projects/smpng/sys/dev/le/if_le_lebuffer.c#2 integrate .. //depot/projects/smpng/sys/dev/le/if_le_ledma.c#4 integrate .. //depot/projects/smpng/sys/dev/le/if_le_pci.c#4 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#37 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#15 integrate .. //depot/projects/smpng/sys/dev/mfi/mfi.c#16 integrate .. //depot/projects/smpng/sys/dev/mlx/mlx.c#19 integrate .. //depot/projects/smpng/sys/dev/mly/mly.c#30 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.c#21 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_cam.h#5 integrate .. //depot/projects/smpng/sys/dev/mpt/mpt_pci.c#30 integrate .. //depot/projects/smpng/sys/dev/mse/mse.c#7 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#12 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#26 integrate .. //depot/projects/smpng/sys/dev/ncv/ncr53c500_pccard.c#21 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#7 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#51 integrate .. //depot/projects/smpng/sys/dev/nsp/nsp_pccard.c#16 integrate .. //depot/projects/smpng/sys/dev/nve/if_nve.c#14 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_attach.c#12 integrate .. //depot/projects/smpng/sys/dev/pccard/pccard.c#44 integrate .. //depot/projects/smpng/sys/dev/pccard/pccardvarp.h#3 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb.c#62 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbb_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/pccbb/pccbbvar.h#19 integrate .. //depot/projects/smpng/sys/dev/pcf/envctrl.c#5 integrate .. //depot/projects/smpng/sys/dev/pcf/pcf_ebus.c#5 integrate .. //depot/projects/smpng/sys/dev/pcf/pcf_isa.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#19 integrate .. //depot/projects/smpng/sys/dev/ppbus/lpt.c#17 integrate .. //depot/projects/smpng/sys/dev/ppbus/ppbconf.c#4 integrate .. //depot/projects/smpng/sys/dev/ppbus/pps.c#20 integrate .. //depot/projects/smpng/sys/dev/ppc/ppc.c#14 integrate .. //depot/projects/smpng/sys/dev/ppc/ppcvar.h#5 integrate .. //depot/projects/smpng/sys/dev/pst/pst-iop.c#6 integrate .. //depot/projects/smpng/sys/dev/puc/puc.c#30 integrate .. //depot/projects/smpng/sys/dev/puc/puc_bfe.h#2 integrate .. //depot/projects/smpng/sys/dev/ral/if_ral_pci.c#5 integrate .. //depot/projects/smpng/sys/dev/ray/if_ray.c#26 integrate .. //depot/projects/smpng/sys/dev/rc/rc.c#19 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#51 integrate .. //depot/projects/smpng/sys/dev/rr232x/osm_bsd.c#3 integrate .. //depot/projects/smpng/sys/dev/safe/safe.c#10 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_isa.c#12 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni_pci.c#9 integrate .. //depot/projects/smpng/sys/dev/sbsh/if_sbsh.c#15 integrate .. //depot/projects/smpng/sys/dev/scc/scc_bfe.h#2 integrate .. //depot/projects/smpng/sys/dev/scc/scc_core.c#3 integrate .. //depot/projects/smpng/sys/dev/sio/sio.c#63 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#11 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#28 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc_cbus.c#6 integrate .. //depot/projects/smpng/sys/dev/snc/if_snc_pccard.c#10 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ad1816.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/isa/ess.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/isa/gusc.c#8 integrate .. //depot/projects/smpng/sys/dev/sound/isa/mss.c#29 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb16.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sb8.c#17 integrate .. //depot/projects/smpng/sys/dev/sound/isa/sbc.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/als4000.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pci/atiixp.c#9 integrate .. //depot/projects/smpng/sys/dev/sound/pci/au88x0.c#11 integrate .. //depot/projects/smpng/sys/dev/sound/pci/aureal.c#14 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cmi.c#32 integrate .. //depot/projects/smpng/sys/dev/sound/pci/cs4281.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csa.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/csapcm.c#16 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ds1.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10k1.c#30 integrate .. //depot/projects/smpng/sys/dev/sound/pci/emu10kx.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24.c#6 integrate .. //depot/projects/smpng/sys/dev/sound/pci/envy24ht.c#4 integrate .. //depot/projects/smpng/sys/dev/sound/pci/fm801.c#19 integrate .. //depot/projects/smpng/sys/dev/sound/pci/ich.c#48 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro.c#21 integrate .. //depot/projects/smpng/sys/dev/sound/pci/maestro3.c#23 integrate .. //depot/projects/smpng/sys/dev/sound/pci/solo.c#18 integrate .. //depot/projects/smpng/sys/dev/sound/pci/t4dwave.c#22 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via8233.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pci/via82c686.c#24 integrate .. //depot/projects/smpng/sys/dev/sound/pci/vibes.c#15 integrate .. //depot/projects/smpng/sys/dev/sound/pcm/sound.c#37 integrate .. //depot/projects/smpng/sys/dev/sr/if_sr.c#22 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_isa.c#9 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pccard.c#17 integrate .. //depot/projects/smpng/sys/dev/stg/tmc18c30_pci.c#6 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#5 integrate .. //depot/projects/smpng/sys/dev/sym/sym_hipd.c#28 integrate .. //depot/projects/smpng/sys/dev/ti/if_ti.c#7 integrate .. //depot/projects/smpng/sys/dev/trm/trm.c#26 integrate .. //depot/projects/smpng/sys/dev/twa/tw_osl_freebsd.c#6 integrate .. //depot/projects/smpng/sys/dev/twe/twe_freebsd.c#25 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#28 integrate .. //depot/projects/smpng/sys/dev/txp/if_txp.c#35 integrate .. //depot/projects/smpng/sys/dev/uart/uart_core.c#14 integrate .. //depot/projects/smpng/sys/dev/ubsec/ubsec.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/ehci_pci.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/ohci_pci.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/uhci_pci.c#16 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#19 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_eisa.c#11 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx_pci.c#14 integrate .. //depot/projects/smpng/sys/dev/wi/if_wi.c#84 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#27 integrate .. //depot/projects/smpng/sys/i386/i386/intr_machdep.c#23 integrate .. //depot/projects/smpng/sys/i386/i386/nexus.c#24 integrate .. //depot/projects/smpng/sys/i386/include/intr_machdep.h#15 integrate .. //depot/projects/smpng/sys/i386/isa/clock.c#52 integrate .. //depot/projects/smpng/sys/i386/isa/isa.c#12 integrate .. //depot/projects/smpng/sys/i386/isa/npx.c#59 integrate .. //depot/projects/smpng/sys/ia64/ia64/interrupt.c#37 integrate .. //depot/projects/smpng/sys/ia64/ia64/nexus.c#14 integrate .. //depot/projects/smpng/sys/ia64/include/intr.h#4 integrate .. //depot/projects/smpng/sys/isa/isa_common.h#7 integrate .. //depot/projects/smpng/sys/kern/bus_if.m#14 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#83 integrate .. //depot/projects/smpng/sys/kern/kern_synch.c#111 integrate .. //depot/projects/smpng/sys/kern/subr_bus.c#64 integrate .. //depot/projects/smpng/sys/kern/uipc_usrreq.c#72 integrate .. //depot/projects/smpng/sys/kern/vfs_bio.c#100 integrate .. //depot/projects/smpng/sys/net/if.c#90 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#79 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#15 integrate .. //depot/projects/smpng/sys/pc98/cbus/clock.c#7 integrate .. //depot/projects/smpng/sys/pc98/cbus/fdc.c#8 integrate .. //depot/projects/smpng/sys/pc98/cbus/pckbd.c#4 integrate .. //depot/projects/smpng/sys/pc98/cbus/sio.c#9 integrate .. //depot/projects/smpng/sys/pci/if_pcn.c#44 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#69 integrate .. //depot/projects/smpng/sys/pci/if_sf.c#45 integrate .. //depot/projects/smpng/sys/pci/if_sis.c#63 integrate .. //depot/projects/smpng/sys/pci/if_ste.c#46 integrate .. //depot/projects/smpng/sys/pci/if_tl.c#35 integrate .. //depot/projects/smpng/sys/pci/if_vr.c#46 integrate .. //depot/projects/smpng/sys/pci/if_wb.c#40 integrate .. //depot/projects/smpng/sys/pci/if_xl.c#71 integrate .. //depot/projects/smpng/sys/pci/intpm.c#15 integrate .. //depot/projects/smpng/sys/powerpc/include/intr_machdep.h#7 integrate .. //depot/projects/smpng/sys/powerpc/include/openpicvar.h#5 integrate .. //depot/projects/smpng/sys/powerpc/powermac/hrowpic.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#10 integrate .. //depot/projects/smpng/sys/powerpc/powerpc/openpic.c#10 integrate .. //depot/projects/smpng/sys/security/mac_biba/mac_biba.c#47 integrate .. //depot/projects/smpng/sys/security/mac_bsdextended/mac_bsdextended.c#24 integrate .. //depot/projects/smpng/sys/security/mac_ifoff/mac_ifoff.c#10 integrate .. //depot/projects/smpng/sys/security/mac_none/mac_none.c#16 integrate .. //depot/projects/smpng/sys/security/mac_partition/mac_partition.c#12 integrate .. //depot/projects/smpng/sys/security/mac_portacl/mac_portacl.c#12 integrate .. //depot/projects/smpng/sys/security/mac_seeotheruids/mac_seeotheruids.c#12 integrate .. //depot/projects/smpng/sys/security/mac_test/mac_test.c#37 integrate .. //depot/projects/smpng/sys/sparc64/fhc/fhc.c#8 integrate .. //depot/projects/smpng/sys/sparc64/include/intr_machdep.h#14 integrate .. //depot/projects/smpng/sys/sparc64/isa/isa.c#18 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#41 integrate .. //depot/projects/smpng/sys/sparc64/sbus/sbus.c#27 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#25 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/nexus.c#16 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/upa.c#5 integrate .. //depot/projects/smpng/sys/sun4v/include/intr_machdep.h#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/hvcons.c#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/intr_machdep.c#5 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/nexus.c#3 integrate .. //depot/projects/smpng/sys/sun4v/sun4v/vnex.c#3 integrate .. //depot/projects/smpng/sys/sys/bus.h#29 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#20 integrate .. //depot/projects/smpng/sys/sys/param.h#110 integrate .. //depot/projects/smpng/sys/sys/sleepqueue.h#10 integrate .. //depot/projects/smpng/sys/sys/systm.h#79 integrate .. //depot/projects/smpng/sys/vm/vm_object.c#91 integrate .. //depot/projects/smpng/sys/vm/vm_page.h#37 integrate Differences ... ==== //depot/projects/smpng/sys/amd64/amd64/intr_machdep.c#23 (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.27 2006/12/12 19:20:18 jhb Exp $ + * $FreeBSD: src/sys/amd64/amd64/intr_machdep.c,v 1.28 2007/02/23 12:18:25 piso Exp $ */ /* @@ -158,8 +158,8 @@ } int -intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep) +intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, void **cookiep) { struct intsrc *isrc; int error; @@ -167,8 +167,8 @@ isrc = intr_lookup_source(vector); if (isrc == NULL) return (EINVAL); - error = intr_event_add_handler(isrc->is_event, name, handler, arg, - intr_priority(flags), flags, cookiep); + error = intr_event_add_handler(isrc->is_event, name, filter, handler, + arg, intr_priority(flags), flags, cookiep); if (error == 0) { intrcnt_updatename(isrc); mtx_lock_spin(&intr_table_lock); @@ -266,7 +266,7 @@ thread = 0; critical_enter(); TAILQ_FOREACH(ih, &ie->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) { + if (ih->ih_filter == NULL) { thread = 1; continue; } @@ -274,9 +274,9 @@ ih->ih_handler, ih->ih_argument == NULL ? frame : ih->ih_argument, ih->ih_name); if (ih->ih_argument == NULL) - ih->ih_handler(frame); + ih->ih_filter(frame); else - ih->ih_handler(ih->ih_argument); + ih->ih_filter(ih->ih_argument); } /* ==== //depot/projects/smpng/sys/amd64/amd64/nexus.c#23 (text+ko) ==== @@ -28,7 +28,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.72 2007/01/22 21:48:42 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/nexus.c,v 1.73 2007/02/23 12:18:25 piso Exp $"); /* * This code implements a `root nexus' for Intel Architecture @@ -95,7 +95,8 @@ static int nexus_release_resource(device_t, device_t, int, int, struct resource *); static int nexus_setup_intr(device_t, device_t, struct resource *, int flags, - void (*)(void *), void *, void **); + driver_filter_t filter, void (*)(void *), void *, + void **); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); static struct resource_list *nexus_get_reslist(device_t dev, device_t child); @@ -417,7 +418,8 @@ */ static int nexus_setup_intr(device_t bus, device_t child, struct resource *irq, - int flags, void (*ihand)(void *), void *arg, void **cookiep) + int flags, driver_filter_t filter, void (*ihand)(void *), + void *arg, void **cookiep) { int error; @@ -437,7 +439,7 @@ return (error); error = intr_add_handler(device_get_nameunit(child), - rman_get_start(irq), ihand, arg, flags, cookiep); + rman_get_start(irq), filter, ihand, arg, flags, cookiep); return (error); } ==== //depot/projects/smpng/sys/amd64/include/intr_machdep.h#13 (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.14 2007/01/22 21:48:42 jhb Exp $ + * $FreeBSD: src/sys/amd64/include/intr_machdep.h,v 1.15 2007/02/23 12:18:26 piso Exp $ */ #ifndef __MACHINE_INTR_MACHDEP_H__ @@ -135,8 +135,9 @@ #else #define intr_add_cpu(apic_id) #endif -int intr_add_handler(const char *name, int vector, driver_intr_t handler, - void *arg, enum intr_type flags, void **cookiep); +int intr_add_handler(const char *name, int vector, driver_filter_t filter, + driver_intr_t handler, void *arg, enum intr_type flags, + void **cookiep); int intr_config_intr(int vector, enum intr_trigger trig, enum intr_polarity pol); void intr_execute_handlers(struct intsrc *isrc, struct trapframe *frame); ==== //depot/projects/smpng/sys/amd64/isa/clock.c#21 (text+ko) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.229 2007/01/23 08:01:20 bde Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/clock.c,v 1.230 2007/02/23 12:18:26 piso Exp $"); /* * Routines to handle clock hardware. @@ -140,7 +140,7 @@ 0 /* quality */ }; -static void +static int clkintr(struct trapframe *frame) { @@ -157,6 +157,7 @@ } KASSERT(!using_lapic_timer, ("clk interrupt enabled with lapic timer")); hardclock(TRAPF_USERMODE(frame), TRAPF_PC(frame)); + return (FILTER_HANDLED); } int @@ -211,11 +212,13 @@ * Stat clock ticks can still be lost, causing minor loss of accuracy * in the statistics, but the stat clock will no longer stop. */ -static void +static int rtcintr(struct trapframe *frame) { + int flag = 0; while (rtcin(RTC_INTR) & RTCIR_PERIOD) { + flag = 1; if (profprocs != 0) { if (--pscnt == 0) pscnt = psdiv; @@ -224,6 +227,7 @@ if (pscnt == psdiv) statclock(TRAPF_USERMODE(frame)); } + return(flag ? FILTER_HANDLED : FILTER_STRAY); } #include "opt_ddb.h" @@ -758,8 +762,8 @@ * timecounter to user a simpler algorithm. */ if (!using_lapic_timer) { - intr_add_handler("clk", 0, (driver_intr_t *)clkintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); + intr_add_handler("clk", 0, (driver_filter_t *)clkintr, NULL, NULL, + INTR_TYPE_CLK, NULL); i8254_intsrc = intr_lookup_source(0); if (i8254_intsrc != NULL) i8254_pending = @@ -792,8 +796,8 @@ /* Enable periodic interrupts from the RTC. */ rtc_statusb |= RTCSB_PINTR; - intr_add_handler("rtc", 8, (driver_intr_t *)rtcintr, NULL, - INTR_TYPE_CLK | INTR_FAST, NULL); + intr_add_handler("rtc", 8, (driver_filter_t *)rtcintr, NULL, NULL, + INTR_TYPE_CLK, NULL); writertc(RTC_STATUSB, rtc_statusb); rtcin(RTC_INTR); ==== //depot/projects/smpng/sys/amd64/isa/isa.c#7 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.148 2005/01/21 05:56:41 peter Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/isa/isa.c,v 1.149 2007/02/23 12:18:26 piso Exp $"); /*- * Modifications for Intel architecture by Garrett A. Wollman. @@ -147,10 +147,11 @@ */ int isa_setup_intr(device_t bus, device_t child, struct resource *r, int flags, - void (*ihand)(void *), void *arg, void **cookiep) + driver_filter_t *filter, void (*ihand)(void *), void *arg, + void **cookiep) { return (BUS_SETUP_INTR(device_get_parent(bus), child, r, flags, - ihand, arg, cookiep)); + filter, ihand, arg, cookiep)); } int ==== //depot/projects/smpng/sys/arm/arm/intr.c#14 (text+ko) ==== @@ -37,7 +37,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.13 2006/11/08 01:32:24 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/intr.c,v 1.14 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> #include <sys/syslog.h> @@ -58,8 +58,8 @@ void arm_handler_execute(struct trapframe *, int); void -arm_setup_irqhandler(const char *name, void (*hand)(void*), void *arg, - int irq, int flags, void **cookiep) +arm_setup_irqhandler(const char *name, driver_filter_t *filt, + void (*hand)(void*), void *arg, int irq, int flags, void **cookiep) { struct intr_event *event; int error; @@ -82,7 +82,7 @@ intrcnt_index++; } - intr_event_add_handler(event, name, hand, arg, + intr_event_add_handler(event, name, filt, hand, arg, intr_priority(flags), flags, cookiep); } @@ -118,10 +118,10 @@ /* Execute fast handlers. */ thread = 0; TAILQ_FOREACH(ih, &event->ie_handlers, ih_next) { - if (!(ih->ih_flags & IH_FAST)) + if (ih->ih_filter == NULL) thread = 1; else - ih->ih_handler(ih->ih_argument ? + ih->ih_filter(ih->ih_argument ? ih->ih_argument : frame); } ==== //depot/projects/smpng/sys/arm/arm/nexus.c#10 (text+ko) ==== @@ -40,7 +40,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.10 2006/11/17 11:56:56 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/arm/nexus.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -81,7 +81,7 @@ struct resource *); static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep); + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep); static int nexus_teardown_intr(device_t, device_t, struct resource *, void *); @@ -125,13 +125,13 @@ static int nexus_setup_intr(device_t dev, device_t child, struct resource *res, int flags, - driver_intr_t *intr, void *arg, void **cookiep) + driver_filter_t *filt, driver_intr_t *intr, void *arg, void **cookiep) { int i; for (i = rman_get_start(res); i <= rman_get_end(res); i++) arm_setup_irqhandler(device_get_nameunit(child), - intr, arg, i, flags, cookiep); + filt, intr, arg, i, flags, cookiep); return (0); } ==== //depot/projects/smpng/sys/arm/at91/at91.c#8 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.10 2006/11/20 06:27:15 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91.c,v 1.11 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -543,14 +543,14 @@ static int at91_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filt, + driver_intr_t *intr, void *arg, void **cookiep) { struct at91_softc *sc = device_get_softc(dev); if (rman_get_start(ires) == AT91RM92_IRQ_SYSTEM && !(flags & INTR_FAST)) panic("All system interrupt ISRs must be type INTR_FAST"); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); bus_space_write_4(sc->sc_st, sc->sc_sys_sh, IC_IECR, 1 << rman_get_start(ires)); ==== //depot/projects/smpng/sys/arm/at91/at91_mci.c#3 (text+ko) ==== @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.2 2007/01/05 01:18:32 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_mci.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -192,7 +192,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_mci_intr, sc, &sc->intrhand); + NULL, at91_mci_intr, sc, &sc->intrhand); if (err) { AT91_MCI_LOCK_DESTROY(sc); goto out; ==== //depot/projects/smpng/sys/arm/at91/at91_pio.c#5 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.4 2006/11/29 08:17:40 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_pio.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -83,7 +83,7 @@ static int at91_pio_probe(device_t dev); static int at91_pio_attach(device_t dev); static int at91_pio_detach(device_t dev); -static void at91_pio_intr(void *); +static int at91_pio_intr(void *); /* helper routines */ static int at91_pio_activate(device_t dev); @@ -148,8 +148,8 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, PIO_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_FAST, - at91_pio_intr, sc, &sc->intrhand); + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, + at91_pio_intr, NULL, sc, &sc->intrhand); if (err) { AT91_PIO_LOCK_DESTROY(sc); goto out; @@ -217,7 +217,7 @@ return; } -static void +static int at91_pio_intr(void *xsc) { struct at91_pio_softc *sc = xsc; @@ -232,7 +232,7 @@ AT91_PIO_UNLOCK(sc); #endif wakeup(sc); - return; + return (FILTER_HANDLED); } static int ==== //depot/projects/smpng/sys/arm/at91/at91_rtc.c#3 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.2 2006/07/14 21:37:19 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_rtc.c,v 1.3 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -110,8 +110,8 @@ * Activate the interrupt, but disable all interrupts in the hardware */ WR4(sc, RTC_IDR, 0xffffffff); - err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_FAST, - at91_rtc_intr, sc, &sc->intrhand); + err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC, + at91_rtc_intr, NULL, sc, &sc->intrhand); if (err) { AT91_RTC_LOCK_DESTROY(sc); goto out; @@ -173,7 +173,7 @@ return; } -static void +static int at91_rtc_intr(void *xsc) { struct at91_rtc_softc *sc = xsc; @@ -188,7 +188,7 @@ AT91_RTC_UNLOCK(sc); #endif wakeup(sc); - return; + return (FILTER_HANDLED); } /* ==== //depot/projects/smpng/sys/arm/at91/at91_spi.c#5 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.4 2006/11/29 07:57:02 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_spi.c,v 1.5 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -163,7 +163,7 @@ if (sc->irq_res == NULL) goto errout; err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_spi_intr, sc, &sc->intrhand); + NULL, at91_spi_intr, sc, &sc->intrhand); if (err != 0) goto errout; return (0); ==== //depot/projects/smpng/sys/arm/at91/at91_ssc.c#4 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.3 2006/10/20 07:08:59 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_ssc.c,v 1.4 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -124,7 +124,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_ssc_intr, sc, &sc->intrhand); + NULL, at91_ssc_intr, sc, &sc->intrhand); if (err) { AT91_SSC_LOCK_DESTROY(sc); goto out; ==== //depot/projects/smpng/sys/arm/at91/at91_st.c#8 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.7 2007/01/05 02:52:06 ticso Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_st.c,v 1.8 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -183,7 +183,7 @@ WR4(ST_CR, ST_CR_WDRST); } -static void +static int clock_intr(void *arg) { struct trapframe *fp = arg; @@ -194,7 +194,9 @@ tot_count += 32768 / hz; #endif hardclock(TRAPF_USERMODE(fp), TRAPF_PC(fp)); + return (FILTER_HANDLED); } + return (FILTER_STRAY); } void @@ -222,8 +224,8 @@ if (!irq) panic("Unable to allocate irq for the system timer"); else - bus_setup_intr(dev, irq, INTR_TYPE_CLK | INTR_FAST, - clock_intr, NULL, &ih); + bus_setup_intr(dev, irq, INTR_TYPE_CLK, + clock_intr, NULL, NULL, &ih); WR4(ST_PIMR, rel_value); ==== //depot/projects/smpng/sys/arm/at91/at91_twi.c#8 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.8 2007/02/06 12:07:14 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.9 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -118,7 +118,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_MISC | INTR_MPSAFE, - at91_twi_intr, sc, &sc->intrhand); + NULL, at91_twi_intr, sc, &sc->intrhand); if (err) { AT91_TWI_LOCK_DESTROY(sc); goto out; ==== //depot/projects/smpng/sys/arm/at91/if_ate.c#13 (text) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.18 2007/02/10 15:43:57 mlaier Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.19 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -226,7 +226,7 @@ * Activate the interrupt */ err = bus_setup_intr(dev, sc->irq_res, INTR_TYPE_NET | INTR_MPSAFE, - ate_intr, sc, &sc->intrhand); + NULL, ate_intr, sc, &sc->intrhand); if (err) { ether_ifdetach(ifp); ATE_LOCK_DESTROY(sc); ==== //depot/projects/smpng/sys/arm/include/intr.h#6 (text+ko) ==== @@ -32,7 +32,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/arm/include/intr.h,v 1.5 2005/06/09 12:26:19 cognet Exp $ + * $FreeBSD: src/sys/arm/include/intr.h,v 1.6 2007/02/23 12:18:27 piso Exp $ * */ @@ -50,7 +50,7 @@ int arm_get_next_irq(void); void arm_mask_irq(uintptr_t); void arm_unmask_irq(uintptr_t); -void arm_setup_irqhandler(const char *, void (*)(void*), void *, int, int, - void **); +void arm_setup_irqhandler(const char *, int (*)(void*), void (*)(void*), + void *, int, int, void **); int arm_remove_irqhandler(void *); #endif /* _MACHINE_INTR_H */ ==== //depot/projects/smpng/sys/arm/sa11x0/sa11x0.c#8 (text+ko) ==== @@ -57,7 +57,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.7 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0.c,v 1.8 2007/02/23 12:18:27 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -91,14 +91,14 @@ static int sa1110_activate_resource(device_t, device_t, int, int, struct resource *); static int sa1110_setup_intr(device_t, device_t, struct resource *, int, - driver_intr_t *, void *, void **); + driver_filter_t *, driver_intr_t *, void *, void **); struct sa11x0_softc *sa11x0_softc; /* There can be only one. */ static int sa1110_setup_intr(device_t dev, device_t child, - struct resource *ires, int flags, driver_intr_t *intr, void *arg, - void **cookiep) + struct resource *ires, int flags, driver_filter_t *filt, + driver_intr_t *intr, void *arg, void **cookiep) { int saved_cpsr; @@ -113,7 +113,7 @@ saved_cpsr = SetCPSR(I32_bit, I32_bit); SetCPSR(I32_bit, saved_cpsr & I32_bit); - BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, intr, arg, + BUS_SETUP_INTR(device_get_parent(dev), child, ires, flags, filt, intr, arg, cookiep); return (0); } ==== //depot/projects/smpng/sys/arm/sa11x0/sa11x0_ost.c#6 (text+ko) ==== @@ -38,7 +38,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.5 2006/10/21 04:25:00 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/sa11x0/sa11x0_ost.c,v 1.6 2007/02/23 12:18:28 piso Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -67,9 +67,9 @@ static int saost_attach(device_t); int gettick(void); -static void clockintr(void *); +static int clockintr(void *); #if 0 -static void statintr(void *); +static int statintr(void *); #endif void rtcinit(void); @@ -141,7 +141,7 @@ } -static void +static int clockintr(arg) void *arg; { @@ -184,10 +184,11 @@ #if 0 mtx_unlock_spin(&clock_lock); #endif + return (FILTER_HANDLED); } #if 0 >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200702231753.l1NHrY93053400>