Date: Wed, 11 Jun 2008 20:51:03 GMT From: Rui Paulo <rpaulo@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 143304 for review Message-ID: <200806112051.m5BKp3oJ095404@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://perforce.freebsd.org/chv.cgi?CH=143304 Change 143304 by rpaulo@rpaulo_zoo on 2008/06/11 20:50:36 IFC Affected files ... .. //depot/projects/tcpecn/Makefile#4 integrate .. //depot/projects/tcpecn/amd64/amd64/pmap.c#10 integrate .. //depot/projects/tcpecn/amd64/conf/GENERIC#10 integrate .. //depot/projects/tcpecn/amd64/conf/NOTES#8 integrate .. //depot/projects/tcpecn/arm/at91/at91_twi.c#2 integrate .. //depot/projects/tcpecn/arm/at91/if_ate.c#4 integrate .. //depot/projects/tcpecn/arm/conf/GUMSTIX#1 branch .. //depot/projects/tcpecn/arm/conf/GUMSTIX.hints#1 branch .. //depot/projects/tcpecn/arm/include/intr.h#3 integrate .. //depot/projects/tcpecn/arm/xscale/i8134x/crb_machdep.c#4 integrate .. //depot/projects/tcpecn/arm/xscale/pxa/files.pxa#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/if_smc_smi.c#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/pxa_gpio.c#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/pxa_icu.c#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/pxa_machdep.c#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/pxa_obio.c#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/pxa_smi.c#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/pxa_space.c#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/pxa_timer.c#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/pxareg.h#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/pxavar.h#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/std.pxa#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/uart_bus_pxa.c#1 branch .. //depot/projects/tcpecn/arm/xscale/pxa/uart_cpu_pxa.c#1 branch .. //depot/projects/tcpecn/boot/common/ufsread.c#2 integrate .. //depot/projects/tcpecn/boot/forth/loader.conf#5 integrate .. //depot/projects/tcpecn/boot/i386/libi386/biossmap.c#2 integrate .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 integrate .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate .. //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#2 integrate .. //depot/projects/tcpecn/compat/linux/linux_file.c#6 integrate .. //depot/projects/tcpecn/compat/linux/linux_mib.c#2 integrate .. //depot/projects/tcpecn/compat/linux/linux_stats.c#4 integrate .. //depot/projects/tcpecn/compat/linux/linux_util.c#4 integrate .. //depot/projects/tcpecn/compat/ndis/subr_ndis.c#5 integrate .. //depot/projects/tcpecn/compat/ndis/subr_ntoskrnl.c#3 integrate .. //depot/projects/tcpecn/conf/NOTES#11 integrate .. //depot/projects/tcpecn/conf/files#12 integrate .. //depot/projects/tcpecn/conf/files.i386#5 integrate .. //depot/projects/tcpecn/conf/files.pc98#4 integrate .. //depot/projects/tcpecn/conf/files.powerpc#8 integrate .. //depot/projects/tcpecn/conf/kern.pre.mk#4 integrate .. //depot/projects/tcpecn/conf/newvers.sh#2 integrate .. //depot/projects/tcpecn/conf/options#11 integrate .. //depot/projects/tcpecn/conf/options.amd64#5 integrate .. //depot/projects/tcpecn/conf/options.arm#2 integrate .. //depot/projects/tcpecn/conf/options.i386#4 integrate .. //depot/projects/tcpecn/conf/options.pc98#3 integrate .. //depot/projects/tcpecn/contrib/pf/net/pf_ioctl.c#4 integrate .. //depot/projects/tcpecn/dev/age/if_age.c#2 integrate .. //depot/projects/tcpecn/dev/ata/ata-all.c#4 integrate .. //depot/projects/tcpecn/dev/ata/ata-chipset.c#6 integrate .. //depot/projects/tcpecn/dev/ata/ata-pci.c#3 integrate .. //depot/projects/tcpecn/dev/ath/ah_osdep.h#3 integrate .. //depot/projects/tcpecn/dev/ath/if_ath.c#7 integrate .. //depot/projects/tcpecn/dev/ath/if_athvar.h#4 integrate .. //depot/projects/tcpecn/dev/atkbdc/psm.c#4 integrate .. //depot/projects/tcpecn/dev/bce/if_bce.c#6 integrate .. //depot/projects/tcpecn/dev/bce/if_bcereg.h#4 integrate .. //depot/projects/tcpecn/dev/bktr/bktr_i2c.c#2 integrate .. //depot/projects/tcpecn/dev/bm/if_bm.c#1 branch .. //depot/projects/tcpecn/dev/bm/if_bmreg.h#1 branch .. //depot/projects/tcpecn/dev/bm/if_bmvar.h#1 branch .. //depot/projects/tcpecn/dev/ciss/ciss.c#4 integrate .. //depot/projects/tcpecn/dev/cnw/if_cnw.c#2 integrate .. //depot/projects/tcpecn/dev/cs/if_cs.c#2 integrate .. //depot/projects/tcpecn/dev/cs/if_cs_isa.c#2 integrate .. //depot/projects/tcpecn/dev/cs/if_cs_pccard.c#2 integrate .. //depot/projects/tcpecn/dev/cs/if_csreg.h#2 integrate .. //depot/projects/tcpecn/dev/cs/if_csvar.h#2 integrate .. //depot/projects/tcpecn/dev/dc/if_dc.c#3 integrate .. //depot/projects/tcpecn/dev/fe/if_fe.c#2 integrate .. //depot/projects/tcpecn/dev/fe/if_fe_pccard.c#2 integrate .. //depot/projects/tcpecn/dev/fe/if_fevar.h#2 integrate .. //depot/projects/tcpecn/dev/harp/if_harp.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore.h#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_aali.h#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_buffer.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_command.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_globals.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_if.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_include.h#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_init.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_intr.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_output.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_receive.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_slave.h#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_stats.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_stats.h#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_timer.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_transmit.c#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_var.h#2 delete .. //depot/projects/tcpecn/dev/hfa/fore_vcm.c#2 delete .. //depot/projects/tcpecn/dev/hfa/hfa_eisa.c#2 delete .. //depot/projects/tcpecn/dev/hfa/hfa_freebsd.c#2 delete .. //depot/projects/tcpecn/dev/hfa/hfa_freebsd.h#2 delete .. //depot/projects/tcpecn/dev/hfa/hfa_pci.c#2 delete .. //depot/projects/tcpecn/dev/hfa/hfa_sbus.c#2 delete .. //depot/projects/tcpecn/dev/ichsmb/ichsmb.c#2 integrate .. //depot/projects/tcpecn/dev/ichsmb/ichsmb_pci.c#3 integrate .. //depot/projects/tcpecn/dev/ichsmb/ichsmb_var.h#2 integrate .. //depot/projects/tcpecn/dev/idt/idt.c#2 delete .. //depot/projects/tcpecn/dev/idt/idt_harp.c#2 delete .. //depot/projects/tcpecn/dev/idt/idt_pci.c#2 delete .. //depot/projects/tcpecn/dev/idt/idtreg.h#2 delete .. //depot/projects/tcpecn/dev/idt/idtvar.h#2 delete .. //depot/projects/tcpecn/dev/ie/if_ie.c#2 integrate .. //depot/projects/tcpecn/dev/ie/if_ie_isa.c#2 integrate .. //depot/projects/tcpecn/dev/ie/if_ievar.h#2 integrate .. //depot/projects/tcpecn/dev/ieee488/upd7210.c#2 integrate .. //depot/projects/tcpecn/dev/if_ndis/if_ndis.c#6 integrate .. //depot/projects/tcpecn/dev/if_ndis/if_ndisvar.h#5 integrate .. //depot/projects/tcpecn/dev/iicbus/iicsmb.c#2 integrate .. //depot/projects/tcpecn/dev/iwi/if_iwi.c#5 integrate .. //depot/projects/tcpecn/dev/iwn/if_iwn.c#2 integrate .. //depot/projects/tcpecn/dev/jme/if_jme.c#1 branch .. //depot/projects/tcpecn/dev/jme/if_jmereg.h#1 branch .. //depot/projects/tcpecn/dev/jme/if_jmevar.h#1 branch .. //depot/projects/tcpecn/dev/led/led.c#2 integrate .. //depot/projects/tcpecn/dev/md/md.c#4 integrate .. //depot/projects/tcpecn/dev/mfi/mfi.c#7 integrate .. //depot/projects/tcpecn/dev/mfi/mfi_ioctl.h#3 integrate .. //depot/projects/tcpecn/dev/mii/jmphy.c#1 branch .. //depot/projects/tcpecn/dev/mii/jmphyreg.h#1 branch .. //depot/projects/tcpecn/dev/mii/lxtphy.c#2 integrate .. //depot/projects/tcpecn/dev/mii/miidevs#8 integrate .. //depot/projects/tcpecn/dev/mii/smcphy.c#1 branch .. //depot/projects/tcpecn/dev/nmdm/nmdm.c#2 integrate .. //depot/projects/tcpecn/dev/nve/if_nve.c#2 integrate .. //depot/projects/tcpecn/dev/nve/if_nvereg.h#2 integrate .. //depot/projects/tcpecn/dev/pccard/pccard_cis.c#2 integrate .. //depot/projects/tcpecn/dev/puc/pucdata.c#4 integrate .. //depot/projects/tcpecn/dev/ral/rt2560.c#5 integrate .. //depot/projects/tcpecn/dev/ral/rt2661.c#4 integrate .. //depot/projects/tcpecn/dev/si/si.c#2 integrate .. //depot/projects/tcpecn/dev/si/si.h#2 integrate .. //depot/projects/tcpecn/dev/smbus/smb.c#2 integrate .. //depot/projects/tcpecn/dev/smc/if_smc.c#1 branch .. //depot/projects/tcpecn/dev/smc/if_smcreg.h#1 branch .. //depot/projects/tcpecn/dev/smc/if_smcvar.h#1 branch .. //depot/projects/tcpecn/dev/snc/dp83932.c#2 integrate .. //depot/projects/tcpecn/dev/snc/dp83932subr.c#2 integrate .. //depot/projects/tcpecn/dev/snc/dp83932var.h#2 integrate .. //depot/projects/tcpecn/dev/snc/if_sncreg.h#2 integrate .. //depot/projects/tcpecn/dev/snp/snp.c#3 integrate .. //depot/projects/tcpecn/dev/sound/pcm/dsp.c#3 integrate .. //depot/projects/tcpecn/dev/tx/if_tx.c#2 integrate .. //depot/projects/tcpecn/dev/tx/if_txvar.h#2 integrate .. //depot/projects/tcpecn/dev/uart/uart_dev_ns8250.c#3 integrate .. //depot/projects/tcpecn/dev/usb/ehci.c#7 integrate .. //depot/projects/tcpecn/dev/usb/ehcivar.h#2 integrate .. //depot/projects/tcpecn/dev/usb/if_rum.c#7 integrate .. //depot/projects/tcpecn/dev/usb/if_ural.c#4 integrate .. //depot/projects/tcpecn/dev/usb/if_zyd.c#7 integrate .. //depot/projects/tcpecn/dev/usb/ubsa.c#5 integrate .. //depot/projects/tcpecn/dev/usb/uplcom.c#3 integrate .. //depot/projects/tcpecn/dev/usb/usbdevs#11 integrate .. //depot/projects/tcpecn/dev/vkbd/vkbd.c#3 integrate .. //depot/projects/tcpecn/dev/wpi/if_wpi.c#9 integrate .. //depot/projects/tcpecn/dev/xe/if_xe.c#2 integrate .. //depot/projects/tcpecn/dev/xe/if_xe_pccard.c#2 integrate .. //depot/projects/tcpecn/dev/xe/if_xevar.h#2 integrate .. //depot/projects/tcpecn/fs/cd9660/cd9660_vnops.c#2 integrate .. //depot/projects/tcpecn/fs/devfs/devfs_vnops.c#7 integrate .. //depot/projects/tcpecn/fs/ntfs/ntfs_ihash.c#2 integrate .. //depot/projects/tcpecn/geom/geom_dev.c#3 integrate .. //depot/projects/tcpecn/i386/acpica/acpi_machdep.c#3 integrate .. //depot/projects/tcpecn/i386/conf/GENERIC#10 integrate .. //depot/projects/tcpecn/i386/conf/NOTES#7 integrate .. //depot/projects/tcpecn/i386/cpufreq/est.c#5 integrate .. //depot/projects/tcpecn/i386/i386/exception.s#4 integrate .. //depot/projects/tcpecn/i4b/capi/README#2 delete .. //depot/projects/tcpecn/i4b/capi/capi.h#2 delete .. //depot/projects/tcpecn/i4b/capi/capi_l4if.c#2 delete .. //depot/projects/tcpecn/i4b/capi/capi_llif.c#2 delete .. //depot/projects/tcpecn/i4b/capi/capi_msgs.c#2 delete .. //depot/projects/tcpecn/i4b/capi/capi_msgs.h#2 delete .. //depot/projects/tcpecn/i4b/capi/iavc/iavc.h#2 delete .. //depot/projects/tcpecn/i4b/capi/iavc/iavc_card.c#2 delete .. //depot/projects/tcpecn/i4b/capi/iavc/iavc_isa.c#2 delete .. //depot/projects/tcpecn/i4b/capi/iavc/iavc_lli.c#2 delete .. //depot/projects/tcpecn/i4b/capi/iavc/iavc_pci.c#2 delete .. //depot/projects/tcpecn/i4b/driver/i4b_ctl.c#2 delete .. //depot/projects/tcpecn/i4b/driver/i4b_ing.c#2 delete .. //depot/projects/tcpecn/i4b/driver/i4b_ipr.c#2 delete .. //depot/projects/tcpecn/i4b/driver/i4b_isppp.c#2 delete .. //depot/projects/tcpecn/i4b/driver/i4b_rbch.c#2 delete .. //depot/projects/tcpecn/i4b/driver/i4b_tel.c#2 delete .. //depot/projects/tcpecn/i4b/driver/i4b_trace.c#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_cause.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_debug.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_global.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_ioctl.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_isdnq931.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_l1l2.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_l2l3.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_l3l4.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_mbuf.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_rbch_ioctl.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_tel_ioctl.h#2 delete .. //depot/projects/tcpecn/i4b/include/i4b_trace.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/i4b_hdlc.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/i4b_hdlc.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/i4b_l1.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/i4b_l1dmux.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/i4b_l1lib.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi/i4b_ifpi_ext.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi/i4b_ifpi_isac.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi/i4b_ifpi_l1.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi/i4b_ifpi_pci.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi2/i4b_ifpi2_ext.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpnp/i4b_ifpnp_ext.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ihfc/i4b_ihfc.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/ihfc/i4b_ihfc_drv.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ihfc/i4b_ihfc_drv.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/ihfc/i4b_ihfc_ext.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/ihfc/i4b_ihfc_l1if.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/ihfc/i4b_ihfc_pnp.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_asuscom_ipac.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_avm_a1.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_bchan.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_ctx_s0P.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_diva.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_drn_ngo.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_dynalink.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_elsa_pcc16.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_elsa_qs1i.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_elsa_qs1p.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_hscx.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_hscx.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_ipac.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_isac.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_isac.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_isic.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_isic.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_isic_ext.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_isic_isa.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_isic_pnp.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_itk_ix1.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_l1.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_l1fsm.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_siemens_isurf.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_sws.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_tel_s016.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_tel_s0163.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_tel_s08.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/isic/i4b_usr_sti.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/itjc/i4b_hdlc.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/itjc/i4b_itjc_ext.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/itjc/i4b_itjc_isac.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/itjc/i4b_itjc_l1.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/itjc/i4b_itjc_l1fsm.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/itjc/i4b_itjc_pci.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/iwic/i4b_iwic.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/iwic/i4b_iwic_bchan.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/iwic/i4b_iwic_dchan.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/iwic/i4b_iwic_ext.h#2 delete .. //depot/projects/tcpecn/i4b/layer1/iwic/i4b_iwic_fsm.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/iwic/i4b_iwic_l1if.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/iwic/i4b_iwic_pci.c#2 delete .. //depot/projects/tcpecn/i4b/layer1/iwic/i4b_w6692.h#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_iframe.c#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_l2.c#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_l2.h#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_l2fsm.c#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_l2fsm.h#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_l2timer.c#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_lme.c#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_mbuf.c#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_sframe.c#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_tei.c#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_uframe.c#2 delete .. //depot/projects/tcpecn/i4b/layer2/i4b_util.c#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_l2if.c#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_l3.h#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_l3fsm.c#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_l3fsm.h#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_l3timer.c#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_l4if.c#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_q931.c#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_q931.h#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_q932fac.c#2 delete .. //depot/projects/tcpecn/i4b/layer3/i4b_q932fac.h#2 delete .. //depot/projects/tcpecn/i4b/layer4/i4b_i4bdrv.c#2 delete .. //depot/projects/tcpecn/i4b/layer4/i4b_l4.c#2 delete .. //depot/projects/tcpecn/i4b/layer4/i4b_l4.h#2 delete .. //depot/projects/tcpecn/i4b/layer4/i4b_l4mgmt.c#2 delete .. //depot/projects/tcpecn/i4b/layer4/i4b_l4timer.c#2 delete .. //depot/projects/tcpecn/ia64/include/atomic.h#4 integrate .. //depot/projects/tcpecn/kern/Make.tags.inc#2 integrate .. //depot/projects/tcpecn/kern/kern_conf.c#5 integrate .. //depot/projects/tcpecn/kern/kern_cpuset.c#4 integrate .. //depot/projects/tcpecn/kern/kern_descrip.c#11 integrate .. //depot/projects/tcpecn/kern/kern_lock.c#8 integrate .. //depot/projects/tcpecn/kern/kern_rwlock.c#8 integrate .. //depot/projects/tcpecn/kern/kern_umtx.c#6 integrate .. //depot/projects/tcpecn/kern/sched_4bsd.c#6 integrate .. //depot/projects/tcpecn/kern/sched_ule.c#8 integrate .. //depot/projects/tcpecn/kern/subr_clist.c#1 branch .. //depot/projects/tcpecn/kern/tty_subr.c#4 delete .. //depot/projects/tcpecn/kern/tty_tty.c#3 integrate .. //depot/projects/tcpecn/kern/uipc_sem.c#4 integrate .. //depot/projects/tcpecn/kern/vfs_export.c#3 integrate .. //depot/projects/tcpecn/kern/vfs_mount.c#10 integrate .. //depot/projects/tcpecn/mips/include/pte.h#2 integrate .. //depot/projects/tcpecn/mips/mips/trap.c#2 integrate .. //depot/projects/tcpecn/modules/Makefile#9 integrate .. //depot/projects/tcpecn/modules/ath_rate_onoe/Makefile#3 integrate .. //depot/projects/tcpecn/modules/ath_rate_sample/Makefile#3 integrate .. //depot/projects/tcpecn/modules/bm/Makefile#1 branch .. //depot/projects/tcpecn/modules/cnw/Makefile#1 branch .. //depot/projects/tcpecn/modules/dtrace/Makefile#2 integrate .. //depot/projects/tcpecn/modules/dtrace/dtraceall/dtraceall.c#2 integrate .. //depot/projects/tcpecn/modules/harp/Makefile#2 delete .. //depot/projects/tcpecn/modules/hfa/Makefile#3 delete .. //depot/projects/tcpecn/modules/hfa/Makefile.inc#2 delete .. //depot/projects/tcpecn/modules/hfa/eisa/Makefile#2 delete .. //depot/projects/tcpecn/modules/hfa/hfa/Makefile#2 delete .. //depot/projects/tcpecn/modules/hfa/pci/Makefile#2 delete .. //depot/projects/tcpecn/modules/hfa/sbus/Makefile#2 delete .. //depot/projects/tcpecn/modules/idt/Makefile#2 delete .. //depot/projects/tcpecn/modules/jme/Makefile#1 branch .. //depot/projects/tcpecn/modules/mii/Makefile#4 integrate .. //depot/projects/tcpecn/modules/netgraph/atm/Makefile#2 integrate .. //depot/projects/tcpecn/modules/netgraph/atm/atmpif/Makefile#2 delete .. //depot/projects/tcpecn/net/if_tap.c#3 integrate .. //depot/projects/tcpecn/net/if_tun.c#2 integrate .. //depot/projects/tcpecn/net/radix_mpath.c#3 integrate .. //depot/projects/tcpecn/net/radix_mpath.h#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211.c#6 integrate .. //depot/projects/tcpecn/net80211/ieee80211_crypto.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_crypto.h#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_crypto_ccmp.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_crypto_tkip.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_crypto_wep.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_ddb.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_freebsd.h#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_ioctl.c#4 integrate .. //depot/projects/tcpecn/net80211/ieee80211_node.c#5 integrate .. //depot/projects/tcpecn/net80211/ieee80211_output.c#4 integrate .. //depot/projects/tcpecn/net80211/ieee80211_proto.c#4 integrate .. //depot/projects/tcpecn/net80211/ieee80211_proto.h#4 integrate .. //depot/projects/tcpecn/net80211/ieee80211_scan.c#3 integrate .. //depot/projects/tcpecn/net80211/ieee80211_var.h#4 integrate .. //depot/projects/tcpecn/netatm/atm.h#2 delete .. //depot/projects/tcpecn/netatm/atm_aal5.c#2 delete .. //depot/projects/tcpecn/netatm/atm_cm.c#2 delete .. //depot/projects/tcpecn/netatm/atm_cm.h#2 delete .. //depot/projects/tcpecn/netatm/atm_device.c#2 delete .. //depot/projects/tcpecn/netatm/atm_if.c#2 delete .. //depot/projects/tcpecn/netatm/atm_if.h#2 delete .. //depot/projects/tcpecn/netatm/atm_ioctl.h#2 delete .. //depot/projects/tcpecn/netatm/atm_pcb.h#2 delete .. //depot/projects/tcpecn/netatm/atm_proto.c#2 delete .. //depot/projects/tcpecn/netatm/atm_sap.h#2 delete .. //depot/projects/tcpecn/netatm/atm_sigmgr.h#2 delete .. //depot/projects/tcpecn/netatm/atm_signal.c#2 delete .. //depot/projects/tcpecn/netatm/atm_socket.c#2 delete .. //depot/projects/tcpecn/netatm/atm_stack.h#2 delete .. //depot/projects/tcpecn/netatm/atm_subr.c#2 delete .. //depot/projects/tcpecn/netatm/atm_sys.h#2 delete .. //depot/projects/tcpecn/netatm/atm_usrreq.c#2 delete .. //depot/projects/tcpecn/netatm/atm_var.h#2 delete .. //depot/projects/tcpecn/netatm/atm_vc.h#2 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm.h#2 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm_event.c#2 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm_if.c#2 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm_input.c#2 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm_load.c#3 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm_output.c#2 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm_serv.h#2 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm_usrreq.c#2 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm_var.h#2 delete .. //depot/projects/tcpecn/netatm/ipatm/ipatm_vcm.c#2 delete .. //depot/projects/tcpecn/netatm/port.h#3 delete .. //depot/projects/tcpecn/netatm/queue.h#2 delete .. //depot/projects/tcpecn/netatm/sigpvc/sigpvc_if.c#3 delete .. //depot/projects/tcpecn/netatm/sigpvc/sigpvc_subr.c#2 delete .. //depot/projects/tcpecn/netatm/sigpvc/sigpvc_var.h#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_arp.c#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_cls.c#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_cls.h#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_if.c#3 delete .. //depot/projects/tcpecn/netatm/spans/spans_kxdr.c#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_kxdr.h#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_msg.c#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_print.c#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_proto.c#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_subr.c#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_util.c#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_var.h#2 delete .. //depot/projects/tcpecn/netatm/spans/spans_xdr.x#2 delete .. //depot/projects/tcpecn/netatm/uni/q2110_sigaa.c#2 delete .. //depot/projects/tcpecn/netatm/uni/q2110_sigcpcs.c#2 delete .. //depot/projects/tcpecn/netatm/uni/q2110_subr.c#2 delete .. //depot/projects/tcpecn/netatm/uni/qsaal1_sigaa.c#2 delete .. //depot/projects/tcpecn/netatm/uni/qsaal1_sigcpcs.c#2 delete .. //depot/projects/tcpecn/netatm/uni/qsaal1_subr.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscf_uni.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscf_uni.h#2 delete .. //depot/projects/tcpecn/netatm/uni/sscf_uni_lower.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscf_uni_upper.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscf_uni_var.h#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop.h#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_lower.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_misc.h#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_pdu.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_pdu.h#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_sigaa.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_sigcpcs.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_subr.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_timer.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_upper.c#2 delete .. //depot/projects/tcpecn/netatm/uni/sscop_var.h#2 delete .. //depot/projects/tcpecn/netatm/uni/uni.h#2 delete .. //depot/projects/tcpecn/netatm/uni/uni_load.c#3 delete .. //depot/projects/tcpecn/netatm/uni/uniarp.c#2 delete .. //depot/projects/tcpecn/netatm/uni/uniarp_cache.c#2 delete .. //depot/projects/tcpecn/netatm/uni/uniarp_input.c#2 delete .. //depot/projects/tcpecn/netatm/uni/uniarp_output.c#2 delete .. //depot/projects/tcpecn/netatm/uni/uniarp_timer.c#2 delete .. //depot/projects/tcpecn/netatm/uni/uniarp_vcm.c#2 delete .. //depot/projects/tcpecn/netatm/uni/uniip.c#2 delete .. //depot/projects/tcpecn/netatm/uni/uniip_var.h#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig.h#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_decode.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_decode.h#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_encode.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_if.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_mbuf.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_mbuf.h#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_msg.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_msg.h#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_print.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_print.h#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_proto.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_sigmgr_state.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_subr.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_util.c#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_var.h#2 delete .. //depot/projects/tcpecn/netatm/uni/unisig_vc_state.c#2 delete .. //depot/projects/tcpecn/netgraph/atm/atmpif/ng_atmpif.c#2 delete .. //depot/projects/tcpecn/netgraph/atm/atmpif/ng_atmpif_harp.c#2 delete .. //depot/projects/tcpecn/netgraph/atm/atmpif/ng_atmpif_var.h#2 delete .. //depot/projects/tcpecn/netgraph/atm/ng_atmpif.h#2 delete .. //depot/projects/tcpecn/netgraph/ng_nat.c#3 integrate .. //depot/projects/tcpecn/netinet/ip_carp.c#3 integrate .. //depot/projects/tcpecn/netinet/ip_fw_nat.c#3 integrate .. //depot/projects/tcpecn/netinet/libalias/alias.c#4 integrate .. //depot/projects/tcpecn/netinet/libalias/alias_db.c#3 integrate .. //depot/projects/tcpecn/netinet/libalias/alias_local.h#3 integrate .. //depot/projects/tcpecn/netinet/tcp_subr.c#6 integrate .. //depot/projects/tcpecn/netinet/tcp_timer.c#3 integrate .. //depot/projects/tcpecn/netinet/udp_usrreq.c#4 integrate .. //depot/projects/tcpecn/netinet6/udp6_usrreq.c#6 integrate .. //depot/projects/tcpecn/netipx/spx_usrreq.c#2 integrate .. //depot/projects/tcpecn/nfs4client/nfs4_vnops.c#6 integrate .. //depot/projects/tcpecn/nfsclient/nfs_vnops.c#6 integrate .. //depot/projects/tcpecn/nfsserver/nfs_serv.c#4 integrate .. //depot/projects/tcpecn/nlm/nlm_prot_impl.c#3 integrate .. //depot/projects/tcpecn/pc98/conf/NOTES#3 integrate .. //depot/projects/tcpecn/pci/amdpm.c#2 integrate .. //depot/projects/tcpecn/pci/amdsmb.c#3 integrate .. //depot/projects/tcpecn/pci/if_xl.c#3 integrate .. //depot/projects/tcpecn/pci/if_xlreg.h#3 integrate .. //depot/projects/tcpecn/pci/intpm.c#3 integrate .. //depot/projects/tcpecn/pci/nfsmb.c#3 integrate .. //depot/projects/tcpecn/pci/viapm.c#2 integrate .. //depot/projects/tcpecn/powerpc/aim/trap.c#4 integrate .. //depot/projects/tcpecn/powerpc/booke/pmap.c#4 integrate .. //depot/projects/tcpecn/powerpc/conf/GENERIC#7 integrate .. //depot/projects/tcpecn/powerpc/conf/NOTES#7 integrate .. //depot/projects/tcpecn/powerpc/include/dbdma.h#1 branch .. //depot/projects/tcpecn/powerpc/powermac/dbdma.c#1 branch .. //depot/projects/tcpecn/powerpc/powermac/dbdmavar.h#1 branch .. //depot/projects/tcpecn/security/audit/audit.c#7 integrate .. //depot/projects/tcpecn/security/audit/audit_pipe.c#4 integrate .. //depot/projects/tcpecn/security/audit/audit_worker.c#7 integrate .. //depot/projects/tcpecn/security/mac/mac_inet.c#3 integrate .. //depot/projects/tcpecn/sys/conf.h#5 integrate .. //depot/projects/tcpecn/sys/file.h#4 integrate .. //depot/projects/tcpecn/sys/mount.h#4 integrate .. //depot/projects/tcpecn/sys/param.h#11 integrate .. //depot/projects/tcpecn/sys/ttydefaults.h#2 integrate .. //depot/projects/tcpecn/vm/vm_page.c#7 integrate Differences ... ==== //depot/projects/tcpecn/Makefile#4 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: src/sys/Makefile,v 1.47 2008/05/21 07:56:10 obrien Exp $ +# $FreeBSD: src/sys/Makefile,v 1.49 2008/05/26 10:39:52 bz Exp $ .include <bsd.own.mk> @@ -9,7 +9,7 @@ # Directories to include in cscope name file and TAGS. CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \ - gnu i4b isa kern libkern modules net net80211 netatalk netatm \ + gnu isa kern libkern modules net net80211 netatalk \ netgraph netinet netinet6 netipsec netipx netnatm netncp \ netsmb nfs nfs4client nfsclient nfsserver opencrypto pccard \ pci rpc security sys ufs vm ${ARCHDIR} ==== //depot/projects/tcpecn/amd64/amd64/pmap.c#10 (text+ko) ==== @@ -77,7 +77,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.618 2008/05/18 04:16:55 alc Exp $"); +__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.619 2008/06/01 07:36:59 alc Exp $"); /* * Manages physical address maps. @@ -2775,22 +2775,20 @@ PMAP_LOCK_ASSERT(pmap, MA_OWNED); firstpte = (pt_entry_t *)PHYS_TO_DMAP(*pde & PG_FRAME); - KASSERT((*firstpte & PG_V) != 0, - ("pmap_promote_pde: firstpte is missing PG_V")); - if ((*firstpte & PG_A) == 0) { + newpde = *firstpte; + if ((newpde & (PG_A | PG_V)) != (PG_A | PG_V)) { pmap_pde_p_failures++; CTR2(KTR_PMAP, "pmap_promote_pde: failure for va %#lx" " in pmap %p", va, pmap); return; } - pa = *firstpte & PG_PS_FRAME; - newpde = *firstpte; if ((newpde & (PG_M | PG_RW)) == PG_RW) newpde &= ~PG_RW; /* * Check all the ptes before promotion */ + pa = newpde & PG_PS_FRAME; for (pte = firstpte; pte < firstpte + NPTEPG; pte++) { retry: oldpte = *pte; ==== //depot/projects/tcpecn/amd64/conf/GENERIC#10 (text+ko) ==== @@ -16,7 +16,7 @@ # If you are in doubt as to the purpose or necessity of a line, check first # in NOTES. # -# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.500 2008/05/19 02:30:27 yongari Exp $ +# $FreeBSD: src/sys/amd64/conf/GENERIC,v 1.501 2008/05/27 02:22:32 yongari Exp $ cpu HAMMER ident GENERIC @@ -205,6 +205,7 @@ device bge # Broadcom BCM570xx Gigabit Ethernet device dc # DEC/Intel 21143 and various workalikes device fxp # Intel EtherExpress PRO/100B (82557, 82558) +device jme # JMicron JMC250 Gigabit/JMC260 Fast Ethernet device lge # Level 1 LXT1001 gigabit Ethernet device msk # Marvell/SysKonnect Yukon II Gigabit Ethernet device nfe # nVidia nForce MCP on-board Ethernet ==== //depot/projects/tcpecn/amd64/conf/NOTES#8 (text+ko) ==== @@ -4,7 +4,7 @@ # This file contains machine dependent kernel configuration notes. For # machine independent notes, look in /sys/conf/NOTES. # -# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.79 2008/04/29 21:36:15 sam Exp $ +# $FreeBSD: src/sys/amd64/conf/NOTES,v 1.80 2008/05/26 10:39:52 bz Exp $ # # @@ -451,120 +451,6 @@ device coretemp device k8temp -#--------------------------------------------------------------------------- -# ISDN4BSD -# -# See /usr/share/examples/isdn/ROADMAP for an introduction to isdn4bsd. -# -# i4b passive ISDN cards support contains the following hardware drivers: -# -# isic - Siemens/Infineon ISDN ISAC/HSCX/IPAC chipset driver -# iwic - Winbond W6692 PCI bus ISDN S/T interface controller -# ifpi - AVM Fritz!Card PCI driver -# ifpi2 - AVM Fritz!Card PCI version 2 driver -# itjc - Siemens ISAC / TJNet Tiger300/320 chipset -# -# i4b active ISDN cards support contains the following hardware drivers: -# -# iavc - AVM B1 PCI, AVM B1 ISA, AVM T1 -# -# Note that the ``options'' (if given) and ``device'' lines must BOTH -# be uncommented to enable support for a given card ! -# -# In addition to a hardware driver (and probably an option) the mandatory -# ISDN protocol stack devices and the mandatory support device must be -# enabled as well as one or more devices from the optional devices section. -# -#--------------------------------------------------------------------------- -# isic driver (Siemens/Infineon chipsets) -# -#XXX#device isic -# -# PCI bus Cards: -# -------------- -# -# ELSA MicroLink ISDN/PCI (same as ELSA QuickStep 1000pro PCI) -options ELSA_QS1PCI -# -#--------------------------------------------------------------------------- -# ifpi2 driver for AVM Fritz!Card PCI version 2 -# -# AVM Fritz!Card PCI version 2 -#XXX#device ifpi2 -# -#--------------------------------------------------------------------------- -# iwic driver for Winbond W6692 chipset -# -# ASUSCOM P-IN100-ST-D (and other Winbond W6692 based cards) -#XXX#device iwic -# -#--------------------------------------------------------------------------- -# itjc driver for Siemens ISAC / TJNet Tiger300/320 chipset -# -# Traverse Technologies NETjet-S -# Teles PCI-TJ -#XXX#device itjc -# -#--------------------------------------------------------------------------- -# iavc driver (AVM active cards, needs i4bcapi driver!) -# -#XXX#device iavc -# -#--------------------------------------------------------------------------- -# ISDN Protocol Stack - mandatory for all hardware drivers -# -# Q.921 / layer 2 - i4b passive cards D channel handling -#XXX#device i4bq921 -# -# Q.931 / layer 3 - i4b passive cards D channel handling -#XXX#device i4bq931 -# -# layer 4 - i4b common passive and active card handling -#XXX#device i4b -# -#--------------------------------------------------------------------------- -# ISDN devices - mandatory for all hardware drivers -# -# userland driver to do ISDN tracing (for passive cards only) -#XXX#device i4btrc -#XXX#options NI4BTRC=4 -# -# userland driver to control the whole thing -#XXX#device i4bctl -# -#--------------------------------------------------------------------------- -# ISDN devices - optional -# -# userland driver for access to raw B channel -#XXX#device i4brbch -#XXX#options NI4BRBCH=4 -# -# userland driver for telephony -#XXX#device i4btel -#XXX#options NI4BTEL=2 -# -# network driver for IP over raw HDLC ISDN -#XXX#device i4bipr -#XXX#options NI4BIPR=4 -# enable VJ header compression detection for ipr i/f -#XXX#options IPR_VJ -# enable logging of the first n IP packets to isdnd (n=32 here) -#XXX#options IPR_LOG=32 -# -# network driver for sync PPP over ISDN; requires an equivalent -# number of sppp device to be configured -#XXX#device i4bisppp -#XXX#options NI4BISPPP=4 -# -# B-channel interface to the netgraph subsystem -#XXX#device i4bing -#XXX#options NI4BING=2 -# -# CAPI driver needed for active ISDN cards (see iavc driver above) -#XXX#device i4bcapi -# -#--------------------------------------------------------------------------- - # # System Management Bus (SMB) # ==== //depot/projects/tcpecn/arm/at91/at91_twi.c#2 (text) ==== @@ -23,7 +23,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.10 2007/03/23 22:57:24 imp Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/at91_twi.c,v 1.11 2008/05/28 14:35:15 imp Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -192,7 +192,7 @@ sc->intrhand = 0; bus_generic_detach(sc->dev); if (sc->mem_res) - bus_release_resource(dev, SYS_RES_IOPORT, + bus_release_resource(dev, SYS_RES_MEMORY, rman_get_rid(sc->mem_res), sc->mem_res); sc->mem_res = 0; if (sc->irq_res) ==== //depot/projects/tcpecn/arm/at91/if_ate.c#4 (text) ==== @@ -33,7 +33,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.23 2008/01/07 00:36:09 cognet Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/at91/if_ate.c,v 1.24 2008/06/09 21:51:48 wkoszek Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -668,7 +668,7 @@ ATE_LOCK(sc); /* XXX TSR register should be cleared */ if (sc->sent_mbuf[0]) { - bus_dmamap_sync(sc->rxtag, sc->tx_map[0], + bus_dmamap_sync(sc->mtag, sc->tx_map[0], BUS_DMASYNC_POSTWRITE); m_freem(sc->sent_mbuf[0]); ifp->if_opackets++; @@ -676,7 +676,7 @@ } if (sc->sent_mbuf[1]) { if (RD4(sc, ETH_TSR) & ETH_TSR_IDLE) { - bus_dmamap_sync(sc->rxtag, sc->tx_map[1], + bus_dmamap_sync(sc->mtag, sc->tx_map[1], BUS_DMASYNC_POSTWRITE); m_freem(sc->sent_mbuf[1]); ifp->if_opackets++; ==== //depot/projects/tcpecn/arm/include/intr.h#3 (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.8 2008/04/20 23:29:06 cognet Exp $ + * $FreeBSD: src/sys/arm/include/intr.h,v 1.9 2008/06/06 05:08:09 benno Exp $ * */ @@ -41,6 +41,9 @@ #ifdef CPU_XSCALE_81342 #define NIRQ 128 +#elif defined(CPU_XSCALE_PXA2X0) +#include <arm/xscale/pxa/pxareg.h> +#define NIRQ IRQ_GPIO_MAX #elif defined(CPU_ARM9) #define NIRQ 64 #else ==== //depot/projects/tcpecn/arm/xscale/i8134x/crb_machdep.c#4 (text+ko) ==== @@ -48,7 +48,7 @@ #include "opt_msgbuf.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.6 2008/04/08 10:24:41 kevlo Exp $"); +__FBSDID("$FreeBSD: src/sys/arm/xscale/i8134x/crb_machdep.c,v 1.7 2008/06/09 05:53:04 kevlo Exp $"); #define _ARM32_BUS_DMA_PRIVATE #include <sys/param.h> @@ -77,7 +77,6 @@ #include <vm/vm.h> #include <vm/pmap.h> -#include <vm/vm.h> #include <vm/vm_object.h> #include <vm/vm_page.h> #include <vm/vm_pager.h> @@ -120,7 +119,6 @@ extern u_int undefined_handler_address; struct pv_addr kernel_pt_table[NUM_KERNEL_PTS]; -extern vm_offset_t sa1_cache_clean_addr; extern int *end; struct pcpu __pcpu; ==== //depot/projects/tcpecn/boot/common/ufsread.c#2 (text+ko) ==== @@ -44,7 +44,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.17 2007/10/26 21:02:31 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/common/ufsread.c,v 1.18 2008/06/07 05:49:24 kib Exp $"); #include <ufs/ufs/dinode.h> #include <ufs/ffs/fs.h> @@ -249,7 +249,7 @@ } else if (lbn < NDADDR + NINDIR(fs)) { n = INDIRPERVBLK(fs); addr = DIP(di_ib[0]); - u = (u_int)(lbn - NDADDR) / (n * DBPERVBLK); + u = (u_int)(lbn - NDADDR) / n * DBPERVBLK; vbaddr = fsbtodb(fs, addr) + u; if (indmap != vbaddr) { if (dskread(indbuf, vbaddr, DBPERVBLK)) ==== //depot/projects/tcpecn/boot/forth/loader.conf#5 (text+ko) ==== @@ -6,7 +6,7 @@ # # All arguments must be in double quotes. # -# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.125 2008/05/19 02:13:50 yongari Exp $ +# $FreeBSD: src/sys/boot/forth/loader.conf,v 1.126 2008/05/27 02:13:25 yongari Exp $ ############################################################## ### Basic configuration options ############################ @@ -241,6 +241,7 @@ # wireless if_ixgb_load="NO" # Intel PRO/10Gb Ethernet if_ixgbe_load="NO" # Intel PRO/10Gb Ethernet PCI Express +if_jme_load="NO" # JMicron JMC250 Gigabit/JMC260 Fast Ethernet if_le_load="NO" # AMD Am7900 LANCE and Am79C9xx PCnet if_lge_load="NO" # Level 1 LXT1001 NetCellerator PCI Gigabit # Ethernet ==== //depot/projects/tcpecn/boot/i386/libi386/biossmap.c#2 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.7 2007/10/28 21:23:49 jhb Exp $"); +__FBSDID("$FreeBSD: src/sys/boot/i386/libi386/biossmap.c,v 1.8 2008/06/07 03:07:32 jhb Exp $"); /* * Obtain memory configuration information from the BIOS @@ -39,7 +39,10 @@ #include "libi386.h" #include "btxv86.h" -static struct bios_smap smap; +static struct { + struct bios_smap _smap_entry; + char pad[8]; /* Bad BIOS writer, no cookie! */ +} smap; static struct bios_smap *smapbase; static int smaplen; ==== //depot/projects/tcpecn/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#2 (text+ko) ==== @@ -17,6 +17,8 @@ * information: Portions Copyright [yyyy] [name of copyright owner] * * CDDL HEADER END + * + * $FreeBSD: src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c,v 1.5 2008/06/11 18:55:19 ed Exp $ */ /* @@ -111,6 +113,7 @@ /* FreeBSD includes: */ #if !defined(sun) +#include <sys/callout.h> #include <sys/ctype.h> #include <sys/limits.h> #include <sys/kdb.h> @@ -3277,11 +3280,13 @@ /* XXX - need to use dtrace_canload() and dtrace_loadptr() */ m.mx = tupregs[0].dttk_value; +#ifdef DOODAD if (LO_CLASSINDEX(&(m.mi->lock_object)) < 2) { regs[rd] = !(m.mi->mtx_lock & MTX_UNOWNED); } else { regs[rd] = !(m.mi->mtx_lock & SX_UNLOCKED); } +#endif break; case DIF_SUBR_MUTEX_OWNER: @@ -11398,13 +11403,23 @@ mutex_enter(&dtrace_lock); /* - * Because we can be called after dtrace_detach() has been called, we - * cannot assert that there are retained enablings. We can safely - * load from dtrace_retained, however: the taskq_destroy() at the - * end of dtrace_detach() will block pending our completion. + * Iterate over all retained enablings to see if any probes match + * against them. We only perform this operation on enablings for which + * we have sufficient permissions by virtue of being in the global zone + * or in the same zone as the DTrace client. Because we can be called + * after dtrace_detach() has been called, we cannot assert that there + * are retained enablings. We can safely load from dtrace_retained, + * however: the taskq_destroy() at the end of dtrace_detach() will + * block pending our completion. */ - for (enab = dtrace_retained; enab != NULL; enab = enab->dten_next) - (void) dtrace_enabling_match(enab, NULL); + for (enab = dtrace_retained; enab != NULL; enab = enab->dten_next) { +#if defined(sun) + cred_t *cr = enab->dten_vstate->dtvs_state->dts_cred.dcr_cred; + + if (INGLOBALZONE(curproc) || getzoneid() == crgetzoneid(cr)) +#endif + (void) dtrace_enabling_match(enab, NULL); + } mutex_exit(&dtrace_lock); mutex_exit(&cpu_lock); @@ -12678,6 +12693,7 @@ } } +#if defined(sun) static void dtrace_state_clean(dtrace_state_t *state) { @@ -12695,9 +12711,51 @@ dtrace_sync(); -#if !defined(sun) + now = dtrace_gethrtime(); + + if (state != dtrace_anon.dta_state && + now - state->dts_laststatus >= dtrace_deadman_user) + return; + + /* + * We must be sure that dts_alive never appears to be less than the + * value upon entry to dtrace_state_deadman(), and because we lack a + * dtrace_cas64(), we cannot store to it atomically. We thus instead + * store INT64_MAX to it, followed by a memory barrier, followed by + * the new value. This assures that dts_alive never appears to be + * less than its true value, regardless of the order in which the + * stores to the underlying storage are issued. + */ + state->dts_alive = INT64_MAX; + dtrace_membar_producer(); + state->dts_alive = now; +} +#else +static void +dtrace_state_clean(void *arg) +{ + dtrace_state_t *state = arg; + dtrace_optval_t *opt = state->dts_options; + + if (state->dts_activity == DTRACE_ACTIVITY_INACTIVE) + return; + + dtrace_dynvar_clean(&state->dts_vstate.dtvs_dynvars); + dtrace_speculation_clean(state); + + callout_reset(&state->dts_cleaner, hz * opt[DTRACEOPT_CLEANRATE] / NANOSEC, + dtrace_state_clean, state); +} + +static void +dtrace_state_deadman(void *arg) +{ + dtrace_state_t *state = arg; + hrtime_t now; + >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200806112051.m5BKp3oJ095404>