PERFORCE change 114991 for review
Matt Jacob
mjacob at FreeBSD.org
Sat Feb 24 20:13:47 UTC 2007
http://perforce.freebsd.org/chv.cgi?CH=114991
Change 114991 by mjacob at mjexp on 2007/02/24 20:12:48
IFC
Affected files ...
.. //depot/projects/mjexp/UPDATING#8 integrate
.. //depot/projects/mjexp/etc/periodic/security/800.loginfail#3 integrate
.. //depot/projects/mjexp/etc/periodic/weekly/310.locate#2 integrate
.. //depot/projects/mjexp/share/man/man4/ppbus.4#2 integrate
.. //depot/projects/mjexp/share/man/man9/Makefile#9 integrate
.. //depot/projects/mjexp/share/man/man9/sleep.9#2 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/intr_machdep.c#5 integrate
.. //depot/projects/mjexp/sys/amd64/amd64/nexus.c#5 integrate
.. //depot/projects/mjexp/sys/amd64/include/intr_machdep.h#6 integrate
.. //depot/projects/mjexp/sys/amd64/isa/clock.c#5 integrate
.. //depot/projects/mjexp/sys/amd64/isa/isa.c#2 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux.h#8 integrate
.. //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#9 integrate
.. //depot/projects/mjexp/sys/arm/arm/intr.c#3 integrate
.. //depot/projects/mjexp/sys/arm/arm/nexus.c#4 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91.c#3 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_mci.c#3 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_pio.c#3 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_rtc.c#2 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_spi.c#4 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_ssc.c#3 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_st.c#4 integrate
.. //depot/projects/mjexp/sys/arm/at91/at91_twi.c#6 integrate
.. //depot/projects/mjexp/sys/arm/at91/if_ate.c#8 integrate
.. //depot/projects/mjexp/sys/arm/include/intr.h#2 integrate
.. //depot/projects/mjexp/sys/arm/sa11x0/sa11x0.c#3 integrate
.. //depot/projects/mjexp/sys/arm/sa11x0/sa11x0_ost.c#3 integrate
.. //depot/projects/mjexp/sys/arm/xscale/i80321/i80321_pci.c#2 integrate
.. //depot/projects/mjexp/sys/arm/xscale/i80321/i80321_timer.c#2 integrate
.. //depot/projects/mjexp/sys/arm/xscale/i80321/iq80321.c#2 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425.c#3 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_npe.c#3 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_pci.c#3 integrate
.. //depot/projects/mjexp/sys/arm/xscale/ixp425/ixp425_timer.c#2 integrate
.. //depot/projects/mjexp/sys/boot/i386/cdboot/cdboot.s#2 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_emul.c#9 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_misc.c#10 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_uid16.c#3 integrate
.. //depot/projects/mjexp/sys/compat/linux/linux_util.c#2 integrate
.. //depot/projects/mjexp/sys/compat/ndis/kern_ndis.c#2 integrate
.. //depot/projects/mjexp/sys/conf/files#13 integrate
.. //depot/projects/mjexp/sys/contrib/dev/oltr/if_oltr.c#2 integrate
.. //depot/projects/mjexp/sys/dev/aac/aac.c#3 integrate
.. //depot/projects/mjexp/sys/dev/aac/aacvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/acpica/Osd/OsdInterrupt.c#2 integrate
.. //depot/projects/mjexp/sys/dev/acpica/Osd/OsdSchedule.c#2 integrate
.. //depot/projects/mjexp/sys/dev/adlink/adlink.c#2 integrate
.. //depot/projects/mjexp/sys/dev/advansys/adv_eisa.c#3 integrate
.. //depot/projects/mjexp/sys/dev/advansys/adv_isa.c#3 integrate
.. //depot/projects/mjexp/sys/dev/advansys/adv_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/advansys/adwcam.c#5 integrate
.. //depot/projects/mjexp/sys/dev/aha/aha_isa.c#3 integrate
.. //depot/projects/mjexp/sys/dev/aha/aha_mca.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ahb/ahb.c#5 integrate
.. //depot/projects/mjexp/sys/dev/aic/aic_cbus.c#2 integrate
.. //depot/projects/mjexp/sys/dev/aic/aic_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/aic/aic_pccard.c#3 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic79xx_osm.c#3 integrate
.. //depot/projects/mjexp/sys/dev/aic7xxx/aic7xxx_osm.c#3 integrate
.. //depot/projects/mjexp/sys/dev/amd/amd.c#5 integrate
.. //depot/projects/mjexp/sys/dev/amr/amr_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/an/if_an_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/an/if_an_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/an/if_an_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ar/if_ar.c#2 integrate
.. //depot/projects/mjexp/sys/dev/arcmsr/arcmsr.c#6 integrate
.. //depot/projects/mjexp/sys/dev/arl/if_arl_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/asr/asr.c#5 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-all.c#5 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-cbus.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-chipset.c#7 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-pci.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ata/ata-pci.h#4 integrate
.. //depot/projects/mjexp/sys/dev/ata/atapi-cd.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ata/atapi-tape.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ath/if_ath_pci.c#4 integrate
.. //depot/projects/mjexp/sys/dev/atkbdc/atkbd_atkbdc.c#2 integrate
.. //depot/projects/mjexp/sys/dev/atkbdc/psm.c#4 integrate
.. //depot/projects/mjexp/sys/dev/awi/if_awi_pccard.c#3 integrate
.. //depot/projects/mjexp/sys/dev/bce/if_bce.c#10 integrate
.. //depot/projects/mjexp/sys/dev/bfe/if_bfe.c#3 integrate
.. //depot/projects/mjexp/sys/dev/bge/if_bge.c#9 integrate
.. //depot/projects/mjexp/sys/dev/bktr/bktr_os.c#2 integrate
.. //depot/projects/mjexp/sys/dev/buslogic/bt.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ce/if_ce.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ciss/ciss.c#5 integrate
.. //depot/projects/mjexp/sys/dev/cm/if_cm_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/cnw/if_cnw.c#3 integrate
.. //depot/projects/mjexp/sys/dev/cp/if_cp.c#4 integrate
.. //depot/projects/mjexp/sys/dev/cs/if_cs_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/cs/if_cs_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ct/ct_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ctau/if_ct.c#4 integrate
.. //depot/projects/mjexp/sys/dev/cx/if_cx.c#4 integrate
.. //depot/projects/mjexp/sys/dev/cy/cy.c#2 integrate
.. //depot/projects/mjexp/sys/dev/cy/cy_isa.c#3 integrate
.. //depot/projects/mjexp/sys/dev/cy/cy_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/cy/cyvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/dc/if_dc.c#6 integrate
.. //depot/projects/mjexp/sys/dev/de/if_de.c#2 integrate
.. //depot/projects/mjexp/sys/dev/dpt/dpt_eisa.c#4 integrate
.. //depot/projects/mjexp/sys/dev/dpt/dpt_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/drm/drm_irq.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ed/if_ed_cbus.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ed/if_ed_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ed/if_ed_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ed/if_ed_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/em/if_em.c#4 integrate
.. //depot/projects/mjexp/sys/dev/en/if_en_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ep/if_ep_eisa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ep/if_ep_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ep/if_ep_mca.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ep/if_ep_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/esp/esp_sbus.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ex/if_ex_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ex/if_ex_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/exca/exca.c#3 integrate
.. //depot/projects/mjexp/sys/dev/fatm/if_fatm.c#2 integrate
.. //depot/projects/mjexp/sys/dev/fdc/fdc.c#3 integrate
.. //depot/projects/mjexp/sys/dev/fe/if_fe.c#2 integrate
.. //depot/projects/mjexp/sys/dev/firewire/fwohci_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/fxp/if_fxp.c#6 integrate
.. //depot/projects/mjexp/sys/dev/gem/if_gem_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/hatm/if_hatm.c#2 integrate
.. //depot/projects/mjexp/sys/dev/hfa/hfa_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/hifn/hifn7751.c#2 integrate
.. //depot/projects/mjexp/sys/dev/hme/if_hme_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/hme/if_hme_sbus.c#2 integrate
.. //depot/projects/mjexp/sys/dev/hptmv/entry.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ichsmb/ichsmb.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ida/ida_eisa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ida/ida_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/idt/idt_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ie/if_ie_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ieee488/pcii.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ieee488/tnt4882.c#2 integrate
.. //depot/projects/mjexp/sys/dev/iir/iir_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ipmi/ipmi.c#5 integrate
.. //depot/projects/mjexp/sys/dev/ips/ips_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ipw/if_ipw.c#3 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp.c#14 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.c#11 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_freebsd.h#8 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_pci.c#15 integrate
.. //depot/projects/mjexp/sys/dev/isp/isp_sbus.c#6 integrate
.. //depot/projects/mjexp/sys/dev/isp/ispmbox.h#6 integrate
.. //depot/projects/mjexp/sys/dev/isp/ispreg.h#4 integrate
.. //depot/projects/mjexp/sys/dev/iwi/if_iwi.c#9 integrate
.. //depot/projects/mjexp/sys/dev/ixgb/if_ixgb.c#2 integrate
.. //depot/projects/mjexp/sys/dev/le/if_le_cbus.c#3 integrate
.. //depot/projects/mjexp/sys/dev/le/if_le_isa.c#3 integrate
.. //depot/projects/mjexp/sys/dev/le/if_le_lebuffer.c#2 integrate
.. //depot/projects/mjexp/sys/dev/le/if_le_ledma.c#3 integrate
.. //depot/projects/mjexp/sys/dev/le/if_le_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/lge/if_lge.c#2 integrate
.. //depot/projects/mjexp/sys/dev/lmc/if_lmc.c#3 integrate
.. //depot/projects/mjexp/sys/dev/mfi/mfi.c#7 integrate
.. //depot/projects/mjexp/sys/dev/mlx/mlx.c#2 integrate
.. //depot/projects/mjexp/sys/dev/mly/mly.c#5 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt.h#7 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.c#12 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_cam.h#3 integrate
.. //depot/projects/mjexp/sys/dev/mpt/mpt_pci.c#7 integrate
.. //depot/projects/mjexp/sys/dev/mse/mse.c#2 integrate
.. //depot/projects/mjexp/sys/dev/msk/if_msk.c#4 integrate
.. //depot/projects/mjexp/sys/dev/mxge/if_mxge.c#8 integrate
.. //depot/projects/mjexp/sys/dev/my/if_my.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ncv/ncr53c500_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/nfe/if_nfe.c#5 integrate
.. //depot/projects/mjexp/sys/dev/nge/if_nge.c#2 integrate
.. //depot/projects/mjexp/sys/dev/nsp/nsp_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/nve/if_nve.c#2 integrate
.. //depot/projects/mjexp/sys/dev/patm/if_patm_attach.c#2 integrate
.. //depot/projects/mjexp/sys/dev/pccard/pccard.c#3 integrate
.. //depot/projects/mjexp/sys/dev/pccard/pccardvarp.h#2 integrate
.. //depot/projects/mjexp/sys/dev/pccbb/pccbb.c#4 integrate
.. //depot/projects/mjexp/sys/dev/pccbb/pccbb_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/pccbb/pccbbvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/pcf/envctrl.c#2 integrate
.. //depot/projects/mjexp/sys/dev/pcf/pcf_ebus.c#2 integrate
.. //depot/projects/mjexp/sys/dev/pcf/pcf_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/pdq/if_fea.c#2 integrate
.. //depot/projects/mjexp/sys/dev/pdq/if_fpa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ppbus/if_plip.c#3 integrate
.. //depot/projects/mjexp/sys/dev/ppbus/lpt.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ppbus/ppbconf.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ppbus/ppi.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ppbus/pps.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ppc/ppc.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ppc/ppcvar.h#2 integrate
.. //depot/projects/mjexp/sys/dev/pst/pst-iop.c#2 integrate
.. //depot/projects/mjexp/sys/dev/puc/puc.c#2 integrate
.. //depot/projects/mjexp/sys/dev/puc/puc_bfe.h#2 integrate
.. //depot/projects/mjexp/sys/dev/ral/if_ral_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ray/if_ray.c#3 integrate
.. //depot/projects/mjexp/sys/dev/rc/rc.c#2 integrate
.. //depot/projects/mjexp/sys/dev/re/if_re.c#7 integrate
.. //depot/projects/mjexp/sys/dev/rr232x/osm_bsd.c#2 integrate
.. //depot/projects/mjexp/sys/dev/safe/safe.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sbni/if_sbni_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sbni/if_sbni_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sbsh/if_sbsh.c#3 integrate
.. //depot/projects/mjexp/sys/dev/scc/scc_bfe.h#2 integrate
.. //depot/projects/mjexp/sys/dev/scc/scc_core.c#2 integrate
.. //depot/projects/mjexp/sys/dev/si/si_eisa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/si/si_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/si/si_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sio/sio.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sk/if_sk.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sn/if_sn.c#2 integrate
.. //depot/projects/mjexp/sys/dev/snc/if_snc_cbus.c#2 integrate
.. //depot/projects/mjexp/sys/dev/snc/if_snc_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/ad1816.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/ess.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/gusc.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/mss.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/sb16.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/sb8.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/isa/sbc.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/als4000.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/atiixp.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/au88x0.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/aureal.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/cmi.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/cs4281.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/csa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/csapcm.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/ds1.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/emu10k1.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/emu10kx.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/envy24.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/envy24ht.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/fm801.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/ich.c#5 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/maestro.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/maestro3.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/solo.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/t4dwave.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/via8233.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/via82c686.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pci/vibes.c#2 integrate
.. //depot/projects/mjexp/sys/dev/sound/pcm/sound.c#4 integrate
.. //depot/projects/mjexp/sys/dev/sr/if_sr.c#2 integrate
.. //depot/projects/mjexp/sys/dev/stg/tmc18c30_isa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/stg/tmc18c30_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/stg/tmc18c30_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/stge/if_stge.c#3 integrate
.. //depot/projects/mjexp/sys/dev/sym/sym_hipd.c#4 integrate
.. //depot/projects/mjexp/sys/dev/ti/if_ti.c#3 integrate
.. //depot/projects/mjexp/sys/dev/trm/trm.c#5 integrate
.. //depot/projects/mjexp/sys/dev/twa/tw_osl_freebsd.c#3 integrate
.. //depot/projects/mjexp/sys/dev/twe/twe_freebsd.c#2 integrate
.. //depot/projects/mjexp/sys/dev/tx/if_tx.c#2 integrate
.. //depot/projects/mjexp/sys/dev/txp/if_txp.c#2 integrate
.. //depot/projects/mjexp/sys/dev/uart/uart_core.c#2 integrate
.. //depot/projects/mjexp/sys/dev/ubsec/ubsec.c#4 integrate
.. //depot/projects/mjexp/sys/dev/usb/ehci_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/usb/ohci_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/slhci_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/dev/usb/uhci_pci.c#3 integrate
.. //depot/projects/mjexp/sys/dev/vge/if_vge.c#4 integrate
.. //depot/projects/mjexp/sys/dev/vx/if_vx_eisa.c#2 integrate
.. //depot/projects/mjexp/sys/dev/vx/if_vx_pci.c#2 integrate
.. //depot/projects/mjexp/sys/dev/wds/wd7000.c#3 integrate
.. //depot/projects/mjexp/sys/dev/wi/if_wi.c#4 integrate
.. //depot/projects/mjexp/sys/dev/wl/if_wl.c#3 integrate
.. //depot/projects/mjexp/sys/dev/xe/if_xe.c#2 integrate
.. //depot/projects/mjexp/sys/geom/geom_dev.c#2 integrate
.. //depot/projects/mjexp/sys/geom/geom_io.c#4 integrate
.. //depot/projects/mjexp/sys/i386/i386/intr_machdep.c#5 integrate
.. //depot/projects/mjexp/sys/i386/i386/nexus.c#5 integrate
.. //depot/projects/mjexp/sys/i386/include/intr_machdep.h#6 integrate
.. //depot/projects/mjexp/sys/i386/isa/clock.c#5 integrate
.. //depot/projects/mjexp/sys/i386/isa/isa.c#2 integrate
.. //depot/projects/mjexp/sys/i386/isa/npx.c#2 integrate
.. //depot/projects/mjexp/sys/i386/linux/imgact_linux.c#2 integrate
.. //depot/projects/mjexp/sys/i386/linux/linux.h#7 integrate
.. //depot/projects/mjexp/sys/i386/linux/linux_machdep.c#9 integrate
.. //depot/projects/mjexp/sys/i4b/capi/iavc/iavc_isa.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/capi/iavc/iavc_pci.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_avm_a1.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_isic_pnp.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_itk_ix1.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s016.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s0163.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_tel_s08.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/isic/i4b_usr_sti.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/itjc/i4b_itjc_pci.c#2 integrate
.. //depot/projects/mjexp/sys/i4b/layer1/iwic/i4b_iwic_pci.c#2 integrate
.. //depot/projects/mjexp/sys/ia64/ia64/interrupt.c#3 integrate
.. //depot/projects/mjexp/sys/ia64/ia64/nexus.c#3 integrate
.. //depot/projects/mjexp/sys/ia64/include/intr.h#2 integrate
.. //depot/projects/mjexp/sys/ia64/isa/isa.c#2 integrate
.. //depot/projects/mjexp/sys/isa/isa_common.h#2 integrate
.. //depot/projects/mjexp/sys/kern/bus_if.m#2 integrate
.. //depot/projects/mjexp/sys/kern/kern_intr.c#7 integrate
.. //depot/projects/mjexp/sys/kern/kern_linker.c#4 integrate
.. //depot/projects/mjexp/sys/kern/kern_synch.c#7 integrate
.. //depot/projects/mjexp/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/mjexp/sys/kern/subr_rman.c#3 integrate
.. //depot/projects/mjexp/sys/modules/ip_mroute_mod/Makefile#3 integrate
.. //depot/projects/mjexp/sys/net/if_bridge.c#6 integrate
.. //depot/projects/mjexp/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#2 integrate
.. //depot/projects/mjexp/sys/netinet/ip_mroute.c#6 integrate
.. //depot/projects/mjexp/sys/netinet6/in6.c#4 integrate
.. //depot/projects/mjexp/sys/netinet6/in6_proto.c#4 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_input.c#3 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_mroute.c#3 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_mroute.h#2 integrate
.. //depot/projects/mjexp/sys/netinet6/ip6_var.h#2 integrate
.. //depot/projects/mjexp/sys/netinet6/raw_ip6.c#2 integrate
.. //depot/projects/mjexp/sys/pc98/cbus/clock.c#4 integrate
.. //depot/projects/mjexp/sys/pc98/cbus/fdc.c#3 integrate
.. //depot/projects/mjexp/sys/pc98/cbus/olpt.c#2 integrate
.. //depot/projects/mjexp/sys/pc98/cbus/pckbd.c#2 integrate
.. //depot/projects/mjexp/sys/pc98/cbus/sio.c#2 integrate
.. //depot/projects/mjexp/sys/pci/if_mn.c#2 integrate
.. //depot/projects/mjexp/sys/pci/if_pcn.c#4 integrate
.. //depot/projects/mjexp/sys/pci/if_rl.c#5 integrate
.. //depot/projects/mjexp/sys/pci/if_sf.c#2 integrate
.. //depot/projects/mjexp/sys/pci/if_sis.c#4 integrate
.. //depot/projects/mjexp/sys/pci/if_sisreg.h#2 integrate
.. //depot/projects/mjexp/sys/pci/if_ste.c#2 integrate
.. //depot/projects/mjexp/sys/pci/if_tl.c#2 integrate
.. //depot/projects/mjexp/sys/pci/if_vr.c#2 integrate
.. //depot/projects/mjexp/sys/pci/if_wb.c#2 integrate
.. //depot/projects/mjexp/sys/pci/if_xl.c#3 integrate
.. //depot/projects/mjexp/sys/pci/intpm.c#3 integrate
.. //depot/projects/mjexp/sys/pci/ncr.c#4 integrate
.. //depot/projects/mjexp/sys/powerpc/include/intr_machdep.h#2 integrate
.. //depot/projects/mjexp/sys/powerpc/include/openpicvar.h#2 integrate
.. //depot/projects/mjexp/sys/powerpc/powermac/hrowpic.c#2 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/intr_machdep.c#3 integrate
.. //depot/projects/mjexp/sys/powerpc/powerpc/openpic.c#2 integrate
.. //depot/projects/mjexp/sys/security/mac_biba/mac_biba.c#6 integrate
.. //depot/projects/mjexp/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate
.. //depot/projects/mjexp/sys/security/mac_ifoff/mac_ifoff.c#4 integrate
.. //depot/projects/mjexp/sys/security/mac_none/mac_none.c#4 integrate
.. //depot/projects/mjexp/sys/security/mac_partition/mac_partition.c#5 integrate
.. //depot/projects/mjexp/sys/security/mac_portacl/mac_portacl.c#6 integrate
.. //depot/projects/mjexp/sys/security/mac_seeotheruids/mac_seeotheruids.c#6 integrate
.. //depot/projects/mjexp/sys/security/mac_test/mac_test.c#5 integrate
.. //depot/projects/mjexp/sys/sparc64/fhc/fhc.c#2 integrate
.. //depot/projects/mjexp/sys/sparc64/include/intr_machdep.h#3 integrate
.. //depot/projects/mjexp/sys/sparc64/isa/isa.c#3 integrate
.. //depot/projects/mjexp/sys/sparc64/pci/psycho.c#3 integrate
.. //depot/projects/mjexp/sys/sparc64/sbus/sbus.c#3 integrate
.. //depot/projects/mjexp/sys/sparc64/sparc64/intr_machdep.c#2 integrate
.. //depot/projects/mjexp/sys/sparc64/sparc64/nexus.c#2 integrate
.. //depot/projects/mjexp/sys/sparc64/sparc64/upa.c#3 integrate
.. //depot/projects/mjexp/sys/sun4v/include/intr_machdep.h#4 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/hvcons.c#3 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/intr_machdep.c#4 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/nexus.c#3 integrate
.. //depot/projects/mjexp/sys/sun4v/sun4v/vnex.c#4 integrate
.. //depot/projects/mjexp/sys/sys/bus.h#2 integrate
.. //depot/projects/mjexp/sys/sys/interrupt.h#3 integrate
.. //depot/projects/mjexp/sys/sys/param.h#9 integrate
.. //depot/projects/mjexp/sys/sys/sleepqueue.h#4 integrate
.. //depot/projects/mjexp/sys/sys/systm.h#7 integrate
.. //depot/projects/mjexp/sys/ufs/ffs/ffs_alloc.c#6 integrate
.. //depot/projects/mjexp/sys/ufs/ffs/ffs_softdep.c#4 integrate
.. //depot/projects/mjexp/usr.bin/tip/tip/value.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/bluetooth/sdpd/server.c#2 integrate
.. //depot/projects/mjexp/usr.sbin/sysinstall/system.c#2 integrate
Differences ...
==== //depot/projects/mjexp/UPDATING#8 (text+ko) ====
@@ -21,6 +21,12 @@
developers choose to disable these features on build machines
to maximize performance.
+20070224:
+ The IPv6 multicast forwarding code may now be loaded into GENERIC
+ kernels by loading the ip_mroute.ko module.
+ The module build heeds the MK_INET6_SUPPORT make.conf option; it
+ may be set to "no" to omit building the IPv6 support.
+
20070218:
The following build error may appear when upgrading from an old
-current (usr.sbin/bsnmpd/modules/snmp_bridge, depend stage):
@@ -743,4 +749,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.474 2007/02/19 22:49:43 njl Exp $
+$FreeBSD: src/UPDATING,v 1.475 2007/02/24 11:41:05 bms Exp $
==== //depot/projects/mjexp/etc/periodic/security/800.loginfail#3 (text+ko) ====
@@ -24,7 +24,7 @@
# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
# SUCH DAMAGE.
#
-# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.7 2007/02/05 16:36:25 jdp Exp $
+# $FreeBSD: src/etc/periodic/security/800.loginfail,v 1.8 2007/02/23 21:42:54 remko Exp $
#
# Show login failures
@@ -59,7 +59,7 @@
[Yy][Ee][Ss])
echo ""
echo "${host} login failures:"
- n=$(catmsgs | egrep -ia "^$yesterday.*(fail|invalid|bad|illegal)" |
+ n=$(catmsgs | egrep -ia "^$yesterday.*: .* (fail|invalid|bad|illegal)" |
tee /dev/stderr | wc -l)
[ $n -gt 0 ] && rc=1 || rc=0;;
*) rc=0;;
==== //depot/projects/mjexp/etc/periodic/weekly/310.locate#2 (text+ko) ====
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.6 2000/09/14 17:19:13 brian Exp $
+# $FreeBSD: src/etc/periodic/weekly/310.locate,v 1.7 2007/02/23 18:44:20 remko Exp $
#
# If there is a global system configuration file, suck it in.
@@ -23,7 +23,7 @@
chmod 644 $locdb || rc=3
cd /
- echo /usr/libexec/locate.updatedb | nice -5 su -fm nobody || rc=3
+ echo /usr/libexec/locate.updatedb | nice -n 5 su -fm nobody || rc=3
chmod 444 $locdb || rc=3;;
*) rc=0;;
==== //depot/projects/mjexp/share/man/man4/ppbus.4#2 (text+ko) ====
@@ -22,7 +22,7 @@
.\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
.\" SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man4/ppbus.4,v 1.23 2005/02/13 22:25:17 ru Exp $
+.\" $FreeBSD: src/share/man/man4/ppbus.4,v 1.24 2007/02/23 16:50:17 schweikh Exp $
.\"
.Dd March 1, 1998
.Dt PPBUS 4
@@ -281,7 +281,7 @@
one, current and available modes are separated.
.Pp
With this level of abstraction a particular chipset may commute from any
-native mode the any other mode emulated with extended modes without
+native mode to any other mode emulated with extended modes without
disturbing upper layers.
For example, most chipsets support NIBBLE mode as
native and emulated with ECP and/or EPP.
@@ -307,7 +307,7 @@
returned each time the driver requests the ppbus.
.Ss Bus allocation and interrupts
ppbus allocation is mandatory not to corrupt I/O of other devices.
-An other
+Another
usage of ppbus allocation is to reserve the port and receive incoming
interrupts.
.Pp
==== //depot/projects/mjexp/share/man/man9/Makefile#9 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/share/man/man9/Makefile,v 1.292 2007/02/16 14:27:59 pjd Exp $
+# $FreeBSD: src/share/man/man9/Makefile,v 1.293 2007/02/23 16:22:09 jhb Exp $
MAN= accept_filter.9 \
accf_data.9 \
@@ -997,6 +997,7 @@
signal.9 trapsignal.9
MLINKS+=sleep.9 msleep.9 \
sleep.9 msleep_spin.9 \
+ sleep.9 pause.9 \
sleep.9 tsleep.9 \
sleep.9 wakeup.9 \
sleep.9 wakeup_one.9
==== //depot/projects/mjexp/share/man/man9/sleep.9#2 (text+ko) ====
@@ -23,7 +23,7 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\"
-.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.49 2006/09/18 15:24:20 ru Exp $
+.\" $FreeBSD: src/share/man/man9/sleep.9,v 1.50 2007/02/23 16:22:09 jhb Exp $
.\"
.Dd April 17, 2006
.Os
@@ -31,6 +31,7 @@
.Sh NAME
.Nm msleep ,
.Nm msleep_spin ,
+.Nm pause ,
.Nm tsleep ,
.Nm wakeup
.Nd wait for events
@@ -39,12 +40,14 @@
.In sys/systm.h
.In sys/proc.h
.Ft int
-.Fn tsleep "void *chan" "int priority" "const char *wmesg" "int timo"
-.Ft int
.Fn msleep "void *chan" "struct mtx *mtx" "int priority" "const char *wmesg" "int timo"
.Ft int
.Fn msleep_spin "void *chan" "struct mtx *mtx" "const char *wmesg" "int timo"
.Ft void
+.Fn pause "const char *wmesg" "int timo"
+.Ft int
+.Fn tsleep "void *chan" "int priority" "const char *wmesg" "int timo"
+.Ft void
.Fn wakeup "void *chan"
.Ft void
.Fn wakeup_one "void *chan"
@@ -53,6 +56,7 @@
.Fn tsleep ,
.Fn msleep ,
.Fn msleep_spin ,
+.Fn pause ,
.Fn wakeup ,
and
.Fn wakeup_one
@@ -61,12 +65,13 @@
external event, it is put to sleep by
.Fn tsleep ,
.Fn msleep ,
+.Fn msleep_spin ,
or
-.Fn msleep_spin .
+.Fn pause .
The parameter
.Fa chan
is an arbitrary address that uniquely identifies the event on which
-the thread is being asleep.
+the thread is being put to sleep.
All threads sleeping on a single
.Fa chan
are woken up later by
@@ -184,6 +189,16 @@
and
.Dv PCATCH
flags.
+.Pp
+The
+.Fn pause
+function is a wrapper around
+.Fn tsleep
+that suspends execution of the current thread for the indicated timeout.
+The thread can not be awakened early by signals or calls to
+.Fn wakeup
+or
+.Fn wakeup_one.
.Sh RETURN VALUES
See above.
.Sh SEE ALSO
@@ -211,6 +226,10 @@
and the
.Fn msleep_spin
function appeared in
+.Fx 6.2 .
+.The
+.Fn pause
+function appeared in
.Fx 7.0 .
.Pp
The
==== //depot/projects/mjexp/sys/amd64/amd64/intr_machdep.c#5 (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.29 2007/02/23 20:03:23 jhb 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,17 +266,17 @@
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;
}
CTR4(KTR_INTR, "%s: exec %p(%p) for %s", __func__,
- ih->ih_handler, ih->ih_argument == NULL ? frame :
+ ih->ih_filter, 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/mjexp/sys/amd64/amd64/nexus.c#5 (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/mjexp/sys/amd64/include/intr_machdep.h#6 (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/mjexp/sys/amd64/isa/clock.c#5 (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/mjexp/sys/amd64/isa/isa.c#2 (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/mjexp/sys/amd64/linux32/linux.h#8 (text+ko) ====
@@ -27,7 +27,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.12 2007/02/15 00:54:40 jkim Exp $
+ * $FreeBSD: src/sys/amd64/linux32/linux.h,v 1.13 2007/02/24 16:49:24 netchild Exp $
*/
#ifndef _AMD64_LINUX_LINUX_H_
@@ -783,7 +783,7 @@
/*
* macros which does the same thing as those in linux include/asm-um/ldt-i386.h
- * these convert linux user-space descriptor to machine one
+ * these convert linux user space descriptor to machine one
*/
#define LDT_entry_a(info) \
((((info)->base_addr & LINUX_LOWERWORD) << 16) | ((info)->limit & LINUX_LOWERWORD))
==== //depot/projects/mjexp/sys/amd64/linux32/linux32_machdep.c#9 (text+ko) ====
@@ -29,7 +29,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.33 2007/02/15 01:20:43 jkim Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/linux32/linux32_machdep.c,v 1.34 2007/02/24 16:49:24 netchild Exp $");
#include <sys/param.h>
#include <sys/kernel.h>
@@ -568,8 +568,8 @@
/*
* XXX: in linux sharing of fs info (chroot/cwd/umask)
* and open files is independant. in fbsd its in one
- * structure but in reality it doesnt make any problems
- * because both this flags are set at once usually.
+ * structure but in reality it doesn't cause any problems
+ * because both of these flags are usually set together.
*/
if (!(args->flags & (CLONE_FILES | CLONE_FS)))
ff |= RFFDG;
@@ -579,7 +579,7 @@
* kernel threads. Unfortunately despite the existence of the
* CLONE_THREAD flag, version of linuxthreads package used in
* most popular distros as of beginning of 2005 doesn't make
- * any use of it. Therefore, this detection relay fully on
+ * any use of it. Therefore, this detection relies on
* empirical observation that linuxthreads sets certain
* combination of flags, so that we can make more or less
* precise detection and notify the FreeBSD kernel that several
@@ -833,7 +833,7 @@
* Our mmap with MAP_STACK takes addr as the maximum
* downsize limit on BOS, and as len the max size of
* the region. It them maps the top SGROWSIZ bytes,
- * and autgrows the region down, up to the limit
+ * and auto grows the region down, up to the limit
* in addr.
*
* If we don't use the MAP_STACK option, the effect
==== //depot/projects/mjexp/sys/arm/arm/intr.c#3 (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/mjexp/sys/arm/arm/nexus.c#4 (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/mjexp/sys/arm/at91/at91.c#3 (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/mjexp/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/mjexp/sys/arm/at91/at91_pio.c#3 (text) ====
@@ -23,7 +23,7 @@
*/
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list