PERFORCE change 142723 for review
Julian Elischer
julian at FreeBSD.org
Sun Jun 1 23:43:26 UTC 2008
http://perforce.freebsd.org/chv.cgi?CH=142723
Change 142723 by julian at julian_trafmon1 on 2008/06/01 23:42:30
IFC at 142722
Affected files ...
.. //depot/projects/vimage/src/sys/Makefile#8 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/exception.S#5 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#8 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#8 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#10 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#15 integrate
.. //depot/projects/vimage/src/sys/amd64/amd64/trap.c#9 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/GENERIC#15 integrate
.. //depot/projects/vimage/src/sys/amd64/conf/NOTES#11 integrate
.. //depot/projects/vimage/src/sys/arm/arm/identcpu.c#4 integrate
.. //depot/projects/vimage/src/sys/arm/arm/pmap.c#13 integrate
.. //depot/projects/vimage/src/sys/arm/at91/at91_twi.c#3 integrate
.. //depot/projects/vimage/src/sys/boot/forth/loader.conf#9 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_cmn_err.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/kern/opensolaris_kmem.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/machine/endian.h#2 delete
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/cmn_err.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/cpuvar.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/cpuvar_defs.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/cyclic.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/cyclic_impl.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/feature_tests.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/kmem.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/pcpu.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/compat/opensolaris/sys/sema.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_mod.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/ctf/ctf_subr.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/dtrace.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/fasttrap.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/lockstat.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/profile.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/sdt_subr.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/dtrace/systrace.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/refcount.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/refcount.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_ioctl.c#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/cmn_err.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpupart.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/cpuvar.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/ctf_api.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/debug.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/dtrace_impl.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/fasttrap.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/isa_defs.h#2 integrate
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/sdt.h#2 delete
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/common/sys/vmem.h#2 delete
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/intel/sys/fasttrap_isa.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/contrib/opensolaris/uts/sparc/sys/fasttrap_isa.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/cyclic/amd64/cyclic_machdep.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/cyclic/cyclic.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/cyclic/cyclic_test.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/cyclic/i386/cyclic_machdep.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtmalloc/dtmalloc.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/amd64/dis_tables.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/amd64/dis_tables.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/amd64/dtrace_asm.S#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/amd64/dtrace_isa.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/amd64/dtrace_subr.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/amd64/instr_size.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_anon.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_cddl.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_clone.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_debug.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_hacks.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_ioctl.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_load.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_modevent.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_sysctl.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_test.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_unload.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/dtrace_vtime.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/i386/dis_tables.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/i386/dis_tables.h#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/i386/dtrace_asm.S#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/i386/dtrace_isa.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/i386/dtrace_subr.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/dtrace/i386/instr_size.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/fbt/fbt.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/profile/profile.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/prototype.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/sdt/sdt.c#1 branch
.. //depot/projects/vimage/src/sys/cddl/dev/systrace/systrace.c#1 branch
.. //depot/projects/vimage/src/sys/compat/ndis/subr_ntoskrnl.c#7 integrate
.. //depot/projects/vimage/src/sys/conf/Makefile.amd64#4 integrate
.. //depot/projects/vimage/src/sys/conf/NOTES#23 integrate
.. //depot/projects/vimage/src/sys/conf/files#25 integrate
.. //depot/projects/vimage/src/sys/conf/files.i386#12 integrate
.. //depot/projects/vimage/src/sys/conf/files.pc98#9 integrate
.. //depot/projects/vimage/src/sys/conf/kern.post.mk#5 integrate
.. //depot/projects/vimage/src/sys/conf/kern.pre.mk#9 integrate
.. //depot/projects/vimage/src/sys/conf/options#25 integrate
.. //depot/projects/vimage/src/sys/conf/options.amd64#5 integrate
.. //depot/projects/vimage/src/sys/conf/options.i386#5 integrate
.. //depot/projects/vimage/src/sys/conf/options.pc98#4 integrate
.. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_ibm.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/acpi_support/acpi_sony.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/age/if_age.c#1 branch
.. //depot/projects/vimage/src/sys/dev/age/if_agereg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/age/if_agevar.h#1 branch
.. //depot/projects/vimage/src/sys/dev/ata/ata-all.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/ath/ah_osdep.h#4 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_ath.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/ath/if_athvar.h#8 integrate
.. //depot/projects/vimage/src/sys/dev/atkbdc/psm.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/bce/if_bce.c#13 integrate
.. //depot/projects/vimage/src/sys/dev/cnw/if_cnw.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/em/if_em.c#11 integrate
.. //depot/projects/vimage/src/sys/dev/harp/if_harp.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore.h#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_aali.h#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_buffer.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_command.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_globals.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_if.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_include.h#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_init.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_intr.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_output.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_receive.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_slave.h#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_stats.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_stats.h#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_timer.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_transmit.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_var.h#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/fore_vcm.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/hfa_eisa.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/hfa_freebsd.c#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/hfa_freebsd.h#2 delete
.. //depot/projects/vimage/src/sys/dev/hfa/hfa_pci.c#3 delete
.. //depot/projects/vimage/src/sys/dev/hfa/hfa_sbus.c#2 delete
.. //depot/projects/vimage/src/sys/dev/idt/idt.c#2 delete
.. //depot/projects/vimage/src/sys/dev/idt/idt_harp.c#2 delete
.. //depot/projects/vimage/src/sys/dev/idt/idt_pci.c#4 delete
.. //depot/projects/vimage/src/sys/dev/idt/idtreg.h#3 delete
.. //depot/projects/vimage/src/sys/dev/idt/idtvar.h#2 delete
.. //depot/projects/vimage/src/sys/dev/ie/if_ie.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/ie/if_ievar.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/ieee488/upd7210.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/if_ndis/if_ndis.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/iwn/if_iwn.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/LICENSE#2 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/README#1 branch
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_82598.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_api.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_api.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_common.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_common.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_osdep.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_phy.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_phy.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/ixgbe_type.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/ixgbe/tcp_lro.c#1 branch
.. //depot/projects/vimage/src/sys/dev/ixgbe/tcp_lro.h#1 branch
.. //depot/projects/vimage/src/sys/dev/jme/if_jme.c#1 branch
.. //depot/projects/vimage/src/sys/dev/jme/if_jmereg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/jme/if_jmevar.h#1 branch
.. //depot/projects/vimage/src/sys/dev/led/led.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/md/md.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfi.c#12 integrate
.. //depot/projects/vimage/src/sys/dev/mfi/mfi_ioctl.h#5 integrate
.. //depot/projects/vimage/src/sys/dev/mii/atphy.c#1 branch
.. //depot/projects/vimage/src/sys/dev/mii/atphyreg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/mii/jmphy.c#1 branch
.. //depot/projects/vimage/src/sys/dev/mii/jmphyreg.h#1 branch
.. //depot/projects/vimage/src/sys/dev/mii/miidevs#11 integrate
.. //depot/projects/vimage/src/sys/dev/nve/if_nve.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/nve/if_nvereg.h#3 integrate
.. //depot/projects/vimage/src/sys/dev/pccard/pccard_cis.c#3 integrate
.. //depot/projects/vimage/src/sys/dev/puc/pucdata.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/snc/dp83932.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/snc/dp83932subr.c#2 integrate
.. //depot/projects/vimage/src/sys/dev/snc/dp83932var.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/snc/if_sncreg.h#2 integrate
.. //depot/projects/vimage/src/sys/dev/sound/midi/sequencer.c#4 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pci/hda/hdac.c#17 integrate
.. //depot/projects/vimage/src/sys/dev/sound/pcm/dsp.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/uart/uart_dev_ns8250.c#5 integrate
.. //depot/projects/vimage/src/sys/dev/usb/umass.c#9 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usb.c#6 integrate
.. //depot/projects/vimage/src/sys/dev/usb/usbdevs#20 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uscanner.c#7 integrate
.. //depot/projects/vimage/src/sys/dev/usb/uxb360gp_rdesc.h#2 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_int.h#3 integrate
.. //depot/projects/vimage/src/sys/fs/devfs/devfs_vnops.c#12 integrate
.. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc.h#2 integrate
.. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vfsops.c#5 integrate
.. //depot/projects/vimage/src/sys/fs/fdescfs/fdesc_vnops.c#6 integrate
.. //depot/projects/vimage/src/sys/fs/udf/udf_vnops.c#7 integrate
.. //depot/projects/vimage/src/sys/geom/geom_dev.c#5 integrate
.. //depot/projects/vimage/src/sys/geom/geom_subr.c#4 integrate
.. //depot/projects/vimage/src/sys/geom/vinum/geom_vinum_share.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/conf/GENERIC#17 integrate
.. //depot/projects/vimage/src/sys/i386/conf/NOTES#16 integrate
.. //depot/projects/vimage/src/sys/i386/cpufreq/est.c#3 integrate
.. //depot/projects/vimage/src/sys/i386/i386/exception.s#4 integrate
.. //depot/projects/vimage/src/sys/i386/i386/genassym.c#7 integrate
.. //depot/projects/vimage/src/sys/i386/i386/identcpu.c#8 integrate
.. //depot/projects/vimage/src/sys/i386/i386/local_apic.c#9 integrate
.. //depot/projects/vimage/src/sys/i386/i386/pmap.c#15 integrate
.. //depot/projects/vimage/src/sys/i386/i386/trap.c#10 integrate
.. //depot/projects/vimage/src/sys/i386/isa/clock.c#9 integrate
.. //depot/projects/vimage/src/sys/i4b/capi/README#2 delete
.. //depot/projects/vimage/src/sys/i4b/capi/capi.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/capi/capi_l4if.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/capi/capi_llif.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/capi/capi_msgs.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/capi/capi_msgs.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_card.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_isa.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_lli.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/capi/iavc/iavc_pci.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_ctl.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_ing.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_ipr.c#5 delete
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_isppp.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_rbch.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_tel.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/driver/i4b_trace.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_cause.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_debug.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_global.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_ioctl.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_isdnq931.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_l1l2.h#3 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_l2l3.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_l3l4.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_mbuf.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_rbch_ioctl.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_tel_ioctl.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/include/i4b_trace.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/i4b_hdlc.c#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/i4b_hdlc.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/i4b_l1.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/i4b_l1dmux.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/i4b_l1lib.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_ext.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_isac.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_l1.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_l1fsm.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi/i4b_ifpi_pci.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_ext.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_isacsx.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_l1fsm.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpi2/i4b_ifpi2_pci.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_avm.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_ext.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_isac.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ifpnp/i4b_ifpnp_l1fsm.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc_drv.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc_ext.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc_l1if.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/ihfc/i4b_ihfc_pnp.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_asuscom_ipac.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_avm_a1.c#5 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_bchan.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_ctx_s0P.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_diva.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_drn_ngo.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_dynalink.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_pcc16.c#5 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_qs1i.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_elsa_qs1p.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_hscx.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_hscx.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_ipac.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isac.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isac.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic_ext.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic_isa.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_isic_pnp.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_itk_ix1.c#5 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_l1.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_l1fsm.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_siemens_isurf.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_sws.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s016.c#5 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s0163.c#5 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_tel_s08.c#5 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/isic/i4b_usr_sti.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_hdlc.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_ext.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_isac.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_l1.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_l1fsm.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/itjc/i4b_itjc_pci.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_bchan.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_dchan.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_ext.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_fsm.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_l1if.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_iwic_pci.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer1/iwic/i4b_w6692.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_iframe.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_l2.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_l2.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_l2fsm.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_l2fsm.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_l2timer.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_lme.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_mbuf.c#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_sframe.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_tei.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_uframe.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer2/i4b_util.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l2if.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l3.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l3fsm.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l3fsm.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l3timer.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_l4if.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_q931.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_q931.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_q932fac.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer3/i4b_q932fac.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer4/i4b_i4bdrv.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer4/i4b_l4.c#4 delete
.. //depot/projects/vimage/src/sys/i4b/layer4/i4b_l4.h#2 delete
.. //depot/projects/vimage/src/sys/i4b/layer4/i4b_l4mgmt.c#3 delete
.. //depot/projects/vimage/src/sys/i4b/layer4/i4b_l4timer.c#3 delete
.. //depot/projects/vimage/src/sys/ia64/ia64/interrupt.c#8 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/machdep.c#13 integrate
.. //depot/projects/vimage/src/sys/ia64/ia64/pmap.c#11 integrate
.. //depot/projects/vimage/src/sys/ia64/include/atomic.h#5 integrate
.. //depot/projects/vimage/src/sys/kern/Make.tags.inc#6 integrate
.. //depot/projects/vimage/src/sys/kern/kern_conf.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_cpuset.c#2 integrate
.. //depot/projects/vimage/src/sys/kern/kern_ctf.c#1 branch
.. //depot/projects/vimage/src/sys/kern/kern_descrip.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/kern_dtrace.c#1 branch
.. //depot/projects/vimage/src/sys/kern/kern_exec.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/kern_exit.c#17 integrate
.. //depot/projects/vimage/src/sys/kern/kern_fork.c#16 integrate
.. //depot/projects/vimage/src/sys/kern/kern_linker.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/kern_lock.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/kern_malloc.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/kern_proc.c#10 integrate
.. //depot/projects/vimage/src/sys/kern/kern_rwlock.c#12 integrate
.. //depot/projects/vimage/src/sys/kern/kern_sdt.c#1 branch
.. //depot/projects/vimage/src/sys/kern/kern_sig.c#11 integrate
.. //depot/projects/vimage/src/sys/kern/kern_umtx.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/link_elf.c#7 integrate
.. //depot/projects/vimage/src/sys/kern/link_elf_obj.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/linker_if.m#3 integrate
.. //depot/projects/vimage/src/sys/kern/sched_4bsd.c#20 integrate
.. //depot/projects/vimage/src/sys/kern/sched_ule.c#23 integrate
.. //depot/projects/vimage/src/sys/kern/subr_bus.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/subr_clist.c#1 branch
.. //depot/projects/vimage/src/sys/kern/subr_smp.c#9 integrate
.. //depot/projects/vimage/src/sys/kern/sys_pipe.c#8 integrate
.. //depot/projects/vimage/src/sys/kern/tty.c#14 integrate
.. //depot/projects/vimage/src/sys/kern/tty_cons.c#6 integrate
.. //depot/projects/vimage/src/sys/kern/tty_subr.c#3 delete
.. //depot/projects/vimage/src/sys/kern/uipc_sem.c#5 integrate
.. //depot/projects/vimage/src/sys/kern/uipc_syscalls.c#18 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_mount.c#15 integrate
.. //depot/projects/vimage/src/sys/kern/vfs_subr.c#12 integrate
.. //depot/projects/vimage/src/sys/mips/mips/pmap.c#2 integrate
.. //depot/projects/vimage/src/sys/modules/Makefile#18 integrate
.. //depot/projects/vimage/src/sys/modules/age/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/ath_rate_onoe/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/modules/ath_rate_sample/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/modules/cnw/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/cyclic/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/Makefile.inc#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/dtmalloc/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/dtrace/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/dtrace_test/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/dtraceall/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/dtraceall/dtraceall.c#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/fasttrap/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/fbt/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/lockstat/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/profile/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/prototype/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/sdt/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/dtrace/systrace/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/harp/Makefile#2 delete
.. //depot/projects/vimage/src/sys/modules/hfa/Makefile#3 delete
.. //depot/projects/vimage/src/sys/modules/hfa/Makefile.inc#2 delete
.. //depot/projects/vimage/src/sys/modules/hfa/eisa/Makefile#2 delete
.. //depot/projects/vimage/src/sys/modules/hfa/hfa/Makefile#2 delete
.. //depot/projects/vimage/src/sys/modules/hfa/pci/Makefile#2 delete
.. //depot/projects/vimage/src/sys/modules/hfa/sbus/Makefile#2 delete
.. //depot/projects/vimage/src/sys/modules/idt/Makefile#2 delete
.. //depot/projects/vimage/src/sys/modules/iwn/Makefile#2 integrate
.. //depot/projects/vimage/src/sys/modules/ixgbe/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/jme/Makefile#1 branch
.. //depot/projects/vimage/src/sys/modules/mii/Makefile#4 integrate
.. //depot/projects/vimage/src/sys/modules/netgraph/atm/Makefile#3 integrate
.. //depot/projects/vimage/src/sys/modules/netgraph/atm/atmpif/Makefile#2 delete
.. //depot/projects/vimage/src/sys/modules/opensolaris/Makefile#1 branch
.. //depot/projects/vimage/src/sys/net/if.c#25 integrate
.. //depot/projects/vimage/src/sys/net/radix_mpath.c#2 integrate
.. //depot/projects/vimage/src/sys/net/radix_mpath.h#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211.c#14 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_adhoc.c#2 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto.h#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_ccmp.c#4 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_tkip.c#4 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_crypto_wep.c#4 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ddb.c#4 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_freebsd.h#9 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_ioctl.c#9 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_node.c#10 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_output.c#11 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.c#10 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_proto.h#10 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_scan.c#5 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_var.h#12 integrate
.. //depot/projects/vimage/src/sys/net80211/ieee80211_wds.c#2 integrate
.. //depot/projects/vimage/src/sys/netatm/atm.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_aal5.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_cm.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/atm_cm.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_device.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_if.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/atm_if.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_ioctl.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_pcb.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_proto.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/atm_sap.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_sigmgr.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_signal.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_socket.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_stack.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_subr.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_sys.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_usrreq.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_var.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/atm_vc.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm_event.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm_if.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm_input.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm_load.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm_output.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm_serv.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm_usrreq.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm_var.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/ipatm/ipatm_vcm.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/port.h#3 delete
.. //depot/projects/vimage/src/sys/netatm/queue.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/sigpvc/sigpvc_if.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/sigpvc/sigpvc_subr.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/sigpvc/sigpvc_var.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_arp.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_cls.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_cls.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_if.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_kxdr.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_kxdr.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_msg.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_print.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_proto.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_subr.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_util.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_var.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/spans/spans_xdr.x#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/q2110_sigaa.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/q2110_sigcpcs.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/q2110_subr.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/qsaal1_sigaa.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/qsaal1_sigcpcs.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/qsaal1_subr.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscf_uni.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscf_uni.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscf_uni_lower.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscf_uni_upper.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscf_uni_var.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_lower.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_misc.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_pdu.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_pdu.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_sigaa.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_sigcpcs.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_subr.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_timer.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_upper.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/sscop_var.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uni.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uni_load.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uniarp.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uniarp_cache.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uniarp_input.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uniarp_output.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uniarp_timer.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uniarp_vcm.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uniip.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/uniip_var.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_decode.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_decode.h#3 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_encode.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_if.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_mbuf.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_mbuf.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_msg.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_msg.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_print.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_print.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_proto.c#3 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_sigmgr_state.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_subr.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_util.c#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_var.h#2 delete
.. //depot/projects/vimage/src/sys/netatm/uni/unisig_vc_state.c#2 delete
.. //depot/projects/vimage/src/sys/netgraph/atm/atmpif/ng_atmpif.c#2 delete
.. //depot/projects/vimage/src/sys/netgraph/atm/atmpif/ng_atmpif_harp.c#2 delete
.. //depot/projects/vimage/src/sys/netgraph/atm/atmpif/ng_atmpif_var.h#2 delete
.. //depot/projects/vimage/src/sys/netgraph/atm/ng_atmpif.h#2 delete
.. //depot/projects/vimage/src/sys/netgraph/ng_nat.c#5 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_dummynet.c#10 integrate
.. //depot/projects/vimage/src/sys/netinet/ip_fw_nat.c#3 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias.c#5 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias_db.c#5 integrate
.. //depot/projects/vimage/src/sys/netinet/libalias/alias_local.h#4 integrate
.. //depot/projects/vimage/src/sys/netinet/raw_ip.c#19 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp.h#12 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_asconf.c#17 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_asconf.h#10 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_cc_functions.c#4 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_constants.h#21 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_indata.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_input.h#6 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_lock_bsd.h#9 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_os_bsd.h#17 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.c#25 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_output.h#11 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_pcb.h#16 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_structs.h#17 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.c#9 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_sysctl.h#7 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_timer.c#17 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_uio.h#14 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_usrreq.c#25 integrate
.. //depot/projects/vimage/src/sys/netinet/sctp_var.h#16 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.c#26 integrate
.. //depot/projects/vimage/src/sys/netinet/sctputil.h#16 integrate
.. //depot/projects/vimage/src/sys/netinet/tcp_subr.c#40 integrate
.. //depot/projects/vimage/src/sys/netinet/udp_usrreq.c#24 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_input.c#27 integrate
.. //depot/projects/vimage/src/sys/netinet6/ip6_var.h#11 integrate
.. //depot/projects/vimage/src/sys/netinet6/sctp6_usrreq.c#22 integrate
.. //depot/projects/vimage/src/sys/netinet6/udp6_usrreq.c#23 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec.c#20 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec.h#7 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_input.c#12 integrate
.. //depot/projects/vimage/src/sys/netipsec/ipsec_osdep.h#4 delete
.. //depot/projects/vimage/src/sys/netipsec/ipsec_output.c#12 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_ah.c#11 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_esp.c#10 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_ipcomp.c#9 integrate
.. //depot/projects/vimage/src/sys/netipsec/xform_ipip.c#13 integrate
.. //depot/projects/vimage/src/sys/netipx/spx_usrreq.c#3 integrate
.. //depot/projects/vimage/src/sys/nfs4client/nfs4_vnops.c#6 integrate
.. //depot/projects/vimage/src/sys/nfsclient/nfs_vnops.c#12 integrate
.. //depot/projects/vimage/src/sys/nfsserver/nfs_serv.c#7 integrate
.. //depot/projects/vimage/src/sys/nlm/nlm_prot_impl.c#2 integrate
.. //depot/projects/vimage/src/sys/pc98/cbus/clock.c#7 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/GENERIC#11 integrate
.. //depot/projects/vimage/src/sys/pc98/conf/NOTES#4 integrate
.. //depot/projects/vimage/src/sys/pci/if_xl.c#8 integrate
.. //depot/projects/vimage/src/sys/pci/if_xlreg.h#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/machdep.c#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/aim/mmu_oea.c#3 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/machdep.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/booke/pmap.c#2 integrate
.. //depot/projects/vimage/src/sys/powerpc/conf/GENERIC#10 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/genassym.c#5 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/mmu_if.m#4 integrate
.. //depot/projects/vimage/src/sys/powerpc/powerpc/pmap_dispatch.c#6 integrate
.. //depot/projects/vimage/src/sys/security/audit/audit_worker.c#7 integrate
.. //depot/projects/vimage/src/sys/security/mac/mac_inet.c#8 integrate
.. //depot/projects/vimage/src/sys/sparc64/conf/GENERIC#10 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/identcpu.c#3 integrate
.. //depot/projects/vimage/src/sys/sparc64/sparc64/pmap.c#9 integrate
.. //depot/projects/vimage/src/sys/sun4v/conf/GENERIC#10 integrate
.. //depot/projects/vimage/src/sys/sun4v/sun4v/pmap.c#10 integrate
.. //depot/projects/vimage/src/sys/sys/clist.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/conf.h#7 integrate
.. //depot/projects/vimage/src/sys/sys/cons.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/dtrace_bsd.h#1 branch
.. //depot/projects/vimage/src/sys/sys/file.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/kdb.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/kernel.h#11 integrate
.. //depot/projects/vimage/src/sys/sys/linker.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/malloc.h#3 integrate
.. //depot/projects/vimage/src/sys/sys/param.h#18 integrate
.. //depot/projects/vimage/src/sys/sys/pipe.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/proc.h#18 integrate
.. //depot/projects/vimage/src/sys/sys/queue.h#2 integrate
.. //depot/projects/vimage/src/sys/sys/sdt.h#1 branch
.. //depot/projects/vimage/src/sys/sys/smp.h#4 integrate
.. //depot/projects/vimage/src/sys/sys/systm.h#11 integrate
.. //depot/projects/vimage/src/sys/sys/time.h#5 integrate
.. //depot/projects/vimage/src/sys/sys/tty.h#3 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/ffs_vfsops.c#8 integrate
.. //depot/projects/vimage/src/sys/ufs/ffs/fs.h#2 integrate
.. //depot/projects/vimage/src/sys/ufs/ufs/ufs_lookup.c#6 integrate
.. //depot/projects/vimage/src/sys/vm/device_pager.c#4 integrate
.. //depot/projects/vimage/src/sys/vm/pmap.h#5 integrate
.. //depot/projects/vimage/src/sys/vm/vm_mmap.c#10 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.c#14 integrate
.. //depot/projects/vimage/src/sys/vm/vm_object.h#4 integrate
.. //depot/projects/vimage/src/sys/vm/vnode_pager.c#7 integrate
Differences ...
==== //depot/projects/vimage/src/sys/Makefile#8 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/sys/Makefile,v 1.46 2008/01/23 08:50:34 maxim Exp $
+# $FreeBSD: src/sys/Makefile,v 1.49 2008/05/26 10:39:52 bz Exp $
.include <bsd.own.mk>
@@ -8,8 +8,8 @@
.endif
# 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 \
+CSCOPEDIRS= boot bsm cam compat conf contrib crypto ddb dev fs gdb geom \
+ 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}
@@ -25,15 +25,20 @@
HTAGSFLAGS+= -at `awk -F= '/^RELEASE *=/{release=$2}; END {print "FreeBSD", release, "kernel"}' < conf/newvers.sh`
# You need the devel/cscope port for this.
-cscope: ${.CURDIR}/cscopenamefile
- cd ${.CURDIR}; cscope -k -p4 -i cscopenamefile
+cscope: cscope.out
+cscope.out: ${.CURDIR}/cscope.files
+ cd ${.CURDIR}; cscope -k -buq -p4
+
+${.CURDIR}/cscope.files: .PHONY
+ cd ${.CURDIR}; \
+ find ${CSCOPEDIRS} -name "*.[chSs]" -a -type f > ${.TARGET}
-${.CURDIR}/cscopenamefile:
- cd ${.CURDIR}; find ${CSCOPEDIRS} -name "*.[csh]" > ${.TARGET}
+cscope-clean:
+ rm -f cscope.files cscope.out cscope.in.out cscope.po.out
# You need the devel/global and one of editor/emacs* ports for that.
-TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscopenamefile
+TAGS ${.CURDIR}/TAGS: ${.CURDIR}/cscope.files
rm -f ${.CURDIR}/TAGS
- cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscopenamefile
+ cd ${.CURDIR}; xargs etags -a < ${.CURDIR}/cscope.files
.include <bsd.subdir.mk>
==== //depot/projects/vimage/src/sys/amd64/amd64/exception.S#5 (text+ko) ====
@@ -31,12 +31,13 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.131 2007/12/07 08:20:15 jkoshy Exp $
+ * $FreeBSD: src/sys/amd64/amd64/exception.S,v 1.132 2008/05/24 06:32:26 jb Exp $
*/
#include "opt_atpic.h"
#include "opt_compat.h"
#include "opt_hwpmc_hooks.h"
+#include "opt_kdtrace.h"
#include <machine/asmacros.h>
#include <machine/psl.h>
@@ -44,6 +45,21 @@
#include "assym.s"
+#ifdef KDTRACE_HOOKS
+ .bss
+ .globl dtrace_invop_jump_addr
+ .align 8
+ .type dtrace_invop_jump_addr, @object
+ .size dtrace_invop_jump_addr, 8
+dtrace_invop_jump_addr:
+ .zero 8
+ .globl dtrace_invop_calltrap_addr
+ .align 8
+ .type dtrace_invop_calltrap_addr, @object
+ .size dtrace_invop_calltrap_addr, 8
+dtrace_invop_calltrap_addr:
+ .zero 8
+#endif
.text
#ifdef HWPMC_HOOKS
ENTRY(start_exceptions)
@@ -170,6 +186,30 @@
movq %r14,TF_R14(%rsp)
movq %r15,TF_R15(%rsp)
FAKE_MCOUNT(TF_RIP(%rsp))
+#ifdef KDTRACE_HOOKS
+ /*
+ * DTrace Function Boundary Trace (fbt) probes are triggered
+ * by int3 (0xcc) which causes the #BP (T_BPTFLT) breakpoint
+ * interrupt. For all other trap types, just handle them in
+ * the usual way.
+ */
+ cmpq $T_BPTFLT,TF_TRAPNO(%rsp)
+ jne calltrap
+
+ /* Check if there is no DTrace hook registered. */
+ cmpq $0,dtrace_invop_jump_addr
+ je calltrap
+
+ /*
+ * Set our jump address for the jump back in the event that
+ * the breakpoint wasn't caused by DTrace at all.
+ */
+ movq $calltrap, dtrace_invop_calltrap_addr(%rip)
+
+ /* Jump to the code hooked in by DTrace. */
+ movq dtrace_invop_jump_addr, %rax
+ jmpq *dtrace_invop_jump_addr
+#endif
.globl calltrap
.type calltrap, at function
calltrap:
==== //depot/projects/vimage/src/sys/amd64/amd64/genassym.c#8 (text+ko) ====
@@ -33,7 +33,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.167 2008/03/23 22:46:37 peter Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/genassym.c,v 1.168 2008/05/16 13:23:47 attilio Exp $");
#include "opt_compat.h"
#include "opt_kstack_pages.h"
@@ -214,7 +214,4 @@
ASSYM(KUC32SEL, GSEL(GUCODE32_SEL, SEL_UPL));
ASSYM(SEL_RPL_MASK, SEL_RPL_MASK);
-ASSYM(MTX_LOCK, offsetof(struct mtx, mtx_lock));
-ASSYM(MTX_RECURSECNT, offsetof(struct mtx, mtx_recurse));
-
ASSYM(MSR_GSBASE, MSR_GSBASE);
==== //depot/projects/vimage/src/sys/amd64/amd64/identcpu.c#8 (text+ko) ====
@@ -39,7 +39,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.158 2008/03/02 07:58:40 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/identcpu.c,v 1.159 2008/05/23 04:03:52 alc Exp $");
#include "opt_cpu.h"
@@ -71,8 +71,6 @@
static void print_AMD_info(void);
static void print_AMD_assoc(int i);
-void setPQL2(int *const size, int *const ways);
-static void setPQL2_AMD(int *const size, int *const ways);
int cpu_class;
char machine[] = "amd64";
@@ -550,30 +548,3 @@
print_AMD_l2_assoc((regs[2] >> 12) & 0x0f);
}
}
-
-static void
-setPQL2_AMD(int *const size, int *const ways)
-{
- if (cpu_exthigh >= 0x80000006) {
- u_int regs[4];
-
- do_cpuid(0x80000006, regs);
- *size = regs[2] >> 16;
- *ways = (regs[2] >> 12) & 0x0f;
- switch (*ways) {
- case 0: /* disabled/not present */
- case 15: /* fully associative */
- default: *ways = 1; break; /* reserved configuration */
- case 4: *ways = 4; break;
- case 6: *ways = 8; break;
- case 8: *ways = 16; break;
- }
- }
-}
-
-void
-setPQL2(int *const size, int *const ways)
-{
- if (strcmp(cpu_vendor, "AuthenticAMD") == 0)
- setPQL2_AMD(size, ways);
-}
==== //depot/projects/vimage/src/sys/amd64/amd64/local_apic.c#10 (text+ko) ====
@@ -32,9 +32,10 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.44 2008/03/16 10:58:02 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/local_apic.c,v 1.45 2008/05/24 06:32:26 jb Exp $");
#include "opt_hwpmc_hooks.h"
+#include "opt_kdtrace.h"
#include "opt_ddb.h"
@@ -65,6 +66,11 @@
#include <ddb/ddb.h>
#endif
+#ifdef KDTRACE_HOOKS
+#include <sys/dtrace_bsd.h>
+cyclic_clock_func_t lapic_cyclic_clock_func[MAXCPU];
+#endif
+
/* Sanity checks on IDT vectors. */
CTASSERT(APIC_IO_INTS + APIC_NUM_IOINTS == APIC_TIMER_INT);
CTASSERT(APIC_TIMER_INT < APIC_LOCAL_INTS);
@@ -668,6 +674,17 @@
(*la->la_timer_count)++;
critical_enter();
+#ifdef KDTRACE_HOOKS
+ /*
+ * If the DTrace hooks are configured and a callback function
+ * has been registered, then call it to process the high speed
+ * timers.
+ */
+ int cpu = PCPU_GET(cpuid);
+ if (lapic_cyclic_clock_func[cpu] != NULL)
+ (*lapic_cyclic_clock_func[cpu])(frame);
+#endif
+
/* Fire hardclock at hz. */
la->la_hard_ticks += hz;
if (la->la_hard_ticks >= lapic_timer_hz) {
==== //depot/projects/vimage/src/sys/amd64/amd64/pmap.c#15 (text+ko) ====
@@ -77,7 +77,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/pmap.c,v 1.617 2008/05/11 20:33:46 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;
@@ -4458,18 +4456,6 @@
critical_exit();
}
-vm_offset_t
-pmap_addr_hint(vm_object_t obj, vm_offset_t addr, vm_size_t size)
-{
-
- if ((obj == NULL) || (size < NBPDR) || (obj->type != OBJT_DEVICE)) {
- return addr;
- }
-
- addr = (addr + (NBPDR - 1)) & ~(NBPDR - 1);
- return addr;
-}
-
/*
* Increase the starting virtual address of the given mapping if a
* different alignment might result in more superpage mappings.
==== //depot/projects/vimage/src/sys/amd64/amd64/trap.c#9 (text+ko) ====
@@ -38,7 +38,7 @@
*/
#include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.325 2008/03/12 10:11:54 jeff Exp $");
+__FBSDID("$FreeBSD: src/sys/amd64/amd64/trap.c,v 1.326 2008/05/24 06:32:26 jb Exp $");
/*
* AMD64 Trap and System call handling
@@ -49,6 +49,7 @@
#include "opt_hwpmc_hooks.h"
#include "opt_isa.h"
#include "opt_kdb.h"
+#include "opt_kdtrace.h"
#include "opt_ktrace.h"
#include <sys/param.h>
@@ -94,6 +95,26 @@
#endif
#include <machine/tss.h>
+#ifdef KDTRACE_HOOKS
+#include <sys/dtrace_bsd.h>
+
+/*
+ * This is a hook which is initialised by the dtrace module
+ * to handle traps which might occur during DTrace probe
+ * execution.
+ */
+dtrace_trap_func_t dtrace_trap_func;
+
+dtrace_doubletrap_func_t dtrace_doubletrap_func;
+
+/*
+ * This is a hook which is initialised by the systrace module
+ * when it is loaded. This keeps the DTrace syscall provider
+ * implementation opaque.
+ */
+systrace_probe_func_t systrace_probe_func;
+#endif
+
extern void trap(struct trapframe *frame);
extern void syscall(struct trapframe *frame);
void dblfault_handler(struct trapframe *frame);
@@ -199,6 +220,24 @@
goto out;
#endif
+#ifdef KDTRACE_HOOKS
+ /*
+ * A trap can occur while DTrace executes a probe. Before
+ * executing the probe, DTrace blocks re-scheduling and sets
+ * a flag in it's per-cpu flags to indicate that it doesn't
+ * want to fault. On returning from the the probe, the no-fault
+ * flag is cleared and finally re-scheduling is enabled.
+ *
+ * If the DTrace kernel module has registered a trap handler,
+ * call it and if it returns non-zero, assume that it has
+ * handled the trap and modified the trap frame so that this
+ * function can return normally.
+ */
+ if (dtrace_trap_func != NULL)
+ if ((*dtrace_trap_func)(frame, type))
+ goto out;
+#endif
+
if ((frame->tf_rflags & PSL_I) == 0) {
/*
* Buggy application or kernel code has disabled
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list