Date: Fri, 19 Sep 2014 19:08:10 GMT From: John Baldwin <jhb@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 1200529 for review Message-ID: <201409191908.s8JJ8AfQ001424@skunkworks.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/@@1200529?ac=10 Change 1200529 by jhb@jhb_ralph on 2014/09/19 19:07:10 IFC @1200528 Affected files ... .. //depot/projects/smpng/share/man/man9/Makefile#47 integrate .. //depot/projects/smpng/share/man/man9/SDT.9#5 integrate .. //depot/projects/smpng/share/man/man9/altq.9#3 integrate .. //depot/projects/smpng/sys/amd64/amd64/fpu.c#34 integrate .. //depot/projects/smpng/sys/amd64/amd64/pmap.c#141 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux.h#32 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#17 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#37 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#36 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_syscalls.c#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#39 integrate .. //depot/projects/smpng/sys/amd64/linux32/linux32_systrace_args.c#7 integrate .. //depot/projects/smpng/sys/amd64/linux32/syscalls.master#40 integrate .. //depot/projects/smpng/sys/arm/allwinner/if_emac.c#2 integrate .. //depot/projects/smpng/sys/arm/at91/if_ate.c#37 integrate .. //depot/projects/smpng/sys/arm/at91/if_macb.c#7 integrate .. //depot/projects/smpng/sys/arm/cavium/cns11xx/if_ece.c#3 integrate .. //depot/projects/smpng/sys/arm/lpc/if_lpe.c#6 integrate .. //depot/projects/smpng/sys/arm/ti/cpsw/if_cpsw.c#7 integrate .. //depot/projects/smpng/sys/arm/xscale/ixp425/if_npe.c#24 integrate .. //depot/projects/smpng/sys/boot/amd64/boot1.efi/boot1.c#2 integrate .. //depot/projects/smpng/sys/boot/amd64/efi/bootinfo.c#4 integrate .. //depot/projects/smpng/sys/boot/efi/include/eficonsctl.h#1 branch .. //depot/projects/smpng/sys/boot/efi/libefi/libefi.c#8 integrate .. //depot/projects/smpng/sys/cam/cam_xpt.c#97 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl.c#15 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_backend_block.c#12 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_cmd_table.c#6 integrate .. //depot/projects/smpng/sys/cam/ctl/ctl_tpc.c#3 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_all.h#36 integrate .. //depot/projects/smpng/sys/cam/scsi/scsi_da.c#121 integrate .. //depot/projects/smpng/sys/cddl/compat/opensolaris/kern/opensolaris_dtrace.c#1 branch .. //depot/projects/smpng/sys/cddl/compat/opensolaris/sys/sdt.h#5 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/arc.c#35 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/bpobj.c#7 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa.c#24 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/spa_misc.c#20 integrate .. //depot/projects/smpng/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/sys/arc.h#14 integrate .. //depot/projects/smpng/sys/cddl/dev/dtrace/powerpc/dtrace_isa.c#6 integrate .. //depot/projects/smpng/sys/cddl/dev/fbt/powerpc/fbt_isa.c#2 integrate .. //depot/projects/smpng/sys/compat/linprocfs/linprocfs.c#101 integrate .. //depot/projects/smpng/sys/compat/linux/linux_timer.c#1 branch .. //depot/projects/smpng/sys/compat/linux/linux_timer.h#1 branch .. //depot/projects/smpng/sys/conf/files#306 integrate .. //depot/projects/smpng/sys/conf/files.amd64#108 integrate .. //depot/projects/smpng/sys/conf/files.i386#166 integrate .. //depot/projects/smpng/sys/conf/files.pc98#123 integrate .. //depot/projects/smpng/sys/contrib/altq/altq/if_altq.h#4 integrate .. //depot/projects/smpng/sys/dev/acpica/acpi.c#146 integrate .. //depot/projects/smpng/sys/dev/ae/if_ae.c#22 integrate .. //depot/projects/smpng/sys/dev/age/if_age.c#24 integrate .. //depot/projects/smpng/sys/dev/alc/if_alc.c#24 integrate .. //depot/projects/smpng/sys/dev/ale/if_ale.c#21 integrate .. //depot/projects/smpng/sys/dev/altera/atse/a_api.h#2 integrate .. //depot/projects/smpng/sys/dev/altera/atse/if_atse.c#5 integrate .. //depot/projects/smpng/sys/dev/an/if_an.c#67 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath.c#114 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_rx.c#11 integrate .. //depot/projects/smpng/sys/dev/ath/if_ath_tx.c#18 integrate .. //depot/projects/smpng/sys/dev/bfe/if_bfe.c#41 integrate .. //depot/projects/smpng/sys/dev/bge/if_bge.c#137 integrate .. //depot/projects/smpng/sys/dev/bm/if_bm.c#13 integrate .. //depot/projects/smpng/sys/dev/bwi/if_bwi.c#19 integrate .. //depot/projects/smpng/sys/dev/bwn/if_bwn.c#23 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe.c#9 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe_stats.c#5 integrate .. //depot/projects/smpng/sys/dev/bxe/bxe_stats.h#3 integrate .. //depot/projects/smpng/sys/dev/bxe/ecore_sp.h#6 integrate .. //depot/projects/smpng/sys/dev/cadence/if_cgem.c#5 integrate .. //depot/projects/smpng/sys/dev/cas/if_cas.c#19 integrate .. //depot/projects/smpng/sys/dev/ce/if_ce.c#23 integrate .. //depot/projects/smpng/sys/dev/cm/smc90cx6.c#23 integrate .. //depot/projects/smpng/sys/dev/cp/if_cp.c#35 integrate .. //depot/projects/smpng/sys/dev/cs/if_cs.c#29 integrate .. //depot/projects/smpng/sys/dev/ctau/if_ct.c#35 integrate .. //depot/projects/smpng/sys/dev/cx/if_cx.c#41 integrate .. //depot/projects/smpng/sys/dev/cxgb/cxgb_main.c#48 integrate .. //depot/projects/smpng/sys/dev/dc/if_dc.c#35 integrate .. //depot/projects/smpng/sys/dev/de/if_de.c#16 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_gem_names.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/drm_gem_names.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_dma.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_drm.h#3 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_drv.c#6 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_drv.h#5 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem.c#11 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem_context.c#1 branch .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem_execbuffer.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_gem_gtt.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_irq.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/i915_reg.h#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_ringbuffer.c#4 integrate .. //depot/projects/smpng/sys/dev/drm2/i915/intel_ringbuffer.h#3 integrate .. //depot/projects/smpng/sys/dev/e1000/if_em.c#43 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.c#50 integrate .. //depot/projects/smpng/sys/dev/e1000/if_igb.h#23 integrate .. //depot/projects/smpng/sys/dev/e1000/if_lem.c#25 integrate .. //depot/projects/smpng/sys/dev/ed/if_ed.c#55 integrate .. //depot/projects/smpng/sys/dev/en/midway.c#40 integrate .. //depot/projects/smpng/sys/dev/ep/if_ep.c#39 integrate .. //depot/projects/smpng/sys/dev/ex/if_ex.c#29 integrate .. //depot/projects/smpng/sys/dev/fatm/if_fatm.c#27 integrate .. //depot/projects/smpng/sys/dev/fe/if_fe.c#32 integrate .. //depot/projects/smpng/sys/dev/ffec/if_ffec.c#7 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.c#57 integrate .. //depot/projects/smpng/sys/dev/firewire/firewire.h#20 integrate .. //depot/projects/smpng/sys/dev/firewire/firewirereg.h#24 integrate .. //depot/projects/smpng/sys/dev/firewire/fwcrom.c#15 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdev.c#33 integrate .. //depot/projects/smpng/sys/dev/firewire/fwdma.c#11 integrate .. //depot/projects/smpng/sys/dev/firewire/fwmem.c#25 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci.c#49 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohci_pci.c#48 integrate .. //depot/projects/smpng/sys/dev/firewire/fwohcivar.h#16 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwe.c#42 integrate .. //depot/projects/smpng/sys/dev/firewire/if_fwip.c#20 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp.c#59 integrate .. //depot/projects/smpng/sys/dev/firewire/sbp_targ.c#20 integrate .. //depot/projects/smpng/sys/dev/fxp/if_fxp.c#110 integrate .. //depot/projects/smpng/sys/dev/gem/if_gem.c#53 integrate .. //depot/projects/smpng/sys/dev/gxemul/ether/if_gx.c#5 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_rx.c#11 integrate .. //depot/projects/smpng/sys/dev/hatm/if_hatm_tx.c#15 integrate .. //depot/projects/smpng/sys/dev/hme/if_hme.c#44 integrate .. //depot/projects/smpng/sys/dev/hyperv/netvsc/hv_netvsc_drv_freebsd.c#7 integrate .. //depot/projects/smpng/sys/dev/ie/if_ie.c#24 integrate .. //depot/projects/smpng/sys/dev/if_ndis/if_ndis.c#74 integrate .. //depot/projects/smpng/sys/dev/iicbus/if_ic.c#27 integrate .. //depot/projects/smpng/sys/dev/ipw/if_ipw.c#30 integrate .. //depot/projects/smpng/sys/dev/iscsi/iscsi.c#7 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.c#86 integrate .. //depot/projects/smpng/sys/dev/isp/isp_freebsd.h#59 integrate .. //depot/projects/smpng/sys/dev/iwi/if_iwi.c#44 integrate .. //depot/projects/smpng/sys/dev/iwn/if_iwn.c#39 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.c#47 integrate .. //depot/projects/smpng/sys/dev/ixgbe/ixgbe.h#24 integrate .. //depot/projects/smpng/sys/dev/ixl/i40e_alloc.h#2 integrate .. //depot/projects/smpng/sys/dev/ixl/i40e_osdep.c#2 integrate .. //depot/projects/smpng/sys/dev/ixl/i40e_osdep.h#2 integrate .. //depot/projects/smpng/sys/dev/ixl/if_ixl.c#3 integrate .. //depot/projects/smpng/sys/dev/ixl/if_ixlv.c#3 integrate .. //depot/projects/smpng/sys/dev/le/am7990.c#8 integrate .. //depot/projects/smpng/sys/dev/le/am79900.c#8 integrate .. //depot/projects/smpng/sys/dev/le/lance.c#11 integrate .. //depot/projects/smpng/sys/dev/lge/if_lge.c#51 integrate .. //depot/projects/smpng/sys/dev/lmc/if_lmc.c#34 integrate .. //depot/projects/smpng/sys/dev/malo/if_malo.c#16 integrate .. //depot/projects/smpng/sys/dev/mge/if_mge.c#18 integrate .. //depot/projects/smpng/sys/dev/mii/rgephy.c#25 integrate .. //depot/projects/smpng/sys/dev/mii/rlphy.c#30 integrate .. //depot/projects/smpng/sys/dev/mii/rlswitch.c#7 integrate .. //depot/projects/smpng/sys/dev/msk/if_msk.c#43 integrate .. //depot/projects/smpng/sys/dev/mwl/if_mwl.c#19 integrate .. //depot/projects/smpng/sys/dev/mxge/if_mxge.c#51 integrate .. //depot/projects/smpng/sys/dev/my/if_my.c#41 integrate .. //depot/projects/smpng/sys/dev/netfpga10g/nf10bmac/if_nf10bmac.c#4 integrate .. //depot/projects/smpng/sys/dev/netmap/if_lem_netmap.h#9 integrate .. //depot/projects/smpng/sys/dev/netmap/if_re_netmap.h#10 integrate .. //depot/projects/smpng/sys/dev/nfe/if_nfe.c#36 integrate .. //depot/projects/smpng/sys/dev/nge/if_nge.c#65 integrate .. //depot/projects/smpng/sys/dev/oce/oce_if.c#12 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_rx.c#12 integrate .. //depot/projects/smpng/sys/dev/patm/if_patm_tx.c#13 integrate .. //depot/projects/smpng/sys/dev/pcn/if_pcn.c#12 integrate .. //depot/projects/smpng/sys/dev/pdq/pdq_ifsubr.c#20 integrate .. //depot/projects/smpng/sys/dev/ppbus/if_plip.c#32 integrate .. //depot/projects/smpng/sys/dev/qlxgbe/ql_hw.c#3 integrate .. //depot/projects/smpng/sys/dev/qlxgbe/ql_isr.c#2 integrate .. //depot/projects/smpng/sys/dev/qlxge/qls_isr.c#2 integrate .. //depot/projects/smpng/sys/dev/ral/rt2560.c#30 integrate .. //depot/projects/smpng/sys/dev/ral/rt2661.c#24 integrate .. //depot/projects/smpng/sys/dev/ral/rt2860.c#6 integrate .. //depot/projects/smpng/sys/dev/re/if_re.c#107 integrate .. //depot/projects/smpng/sys/dev/rl/if_rl.c#1 branch .. //depot/projects/smpng/sys/dev/rl/if_rlreg.h#1 branch .. //depot/projects/smpng/sys/dev/rt/if_rt.c#9 integrate .. //depot/projects/smpng/sys/dev/sbni/if_sbni.c#29 integrate .. //depot/projects/smpng/sys/dev/sf/if_sf.c#14 integrate .. //depot/projects/smpng/sys/dev/sge/if_sge.c#12 integrate .. //depot/projects/smpng/sys/dev/sis/if_sis.c#22 integrate .. //depot/projects/smpng/sys/dev/sk/if_sk.c#32 integrate .. //depot/projects/smpng/sys/dev/smc/if_smc.c#11 integrate .. //depot/projects/smpng/sys/dev/sn/if_sn.c#36 integrate .. //depot/projects/smpng/sys/dev/snc/dp83932.c#24 integrate .. //depot/projects/smpng/sys/dev/ste/if_ste.c#16 integrate .. //depot/projects/smpng/sys/dev/stge/if_stge.c#27 integrate .. //depot/projects/smpng/sys/dev/tl/if_tl.c#10 integrate .. //depot/projects/smpng/sys/dev/tsec/if_tsec.c#14 integrate .. //depot/projects/smpng/sys/dev/tx/if_tx.c#39 integrate .. //depot/projects/smpng/sys/dev/usb/misc/uled.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_aue.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axe.c#30 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_axge.c#4 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cdce.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_cue.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_ipheth.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_kue.c#21 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_mos.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_rue.c#22 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_smsc.c#8 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_udav.c#25 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_urndis.c#2 integrate .. //depot/projects/smpng/sys/dev/usb/net/if_usie.c#9 integrate .. //depot/projects/smpng/sys/dev/usb/net/uhso.c#19 integrate .. //depot/projects/smpng/sys/dev/usb/net/usb_ethernet.c#20 integrate .. //depot/projects/smpng/sys/dev/usb/serial/u3g.c#41 integrate .. //depot/projects/smpng/sys/dev/usb/usbdevs#195 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rsu.c#5 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_rum.c#33 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_run.c#31 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_uath.c#24 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_upgt.c#26 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_ural.c#29 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtw.c#23 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_urtwn.c#11 integrate .. //depot/projects/smpng/sys/dev/usb/wlan/if_zyd.c#31 integrate .. //depot/projects/smpng/sys/dev/vge/if_vge.c#40 integrate .. //depot/projects/smpng/sys/dev/virtio/network/if_vtnet.c#17 integrate .. //depot/projects/smpng/sys/dev/vr/if_vr.c#19 integrate .. //depot/projects/smpng/sys/dev/vt/hw/efifb/efifb.c#4 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_early_fb.c#5 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_fb.c#8 integrate .. //depot/projects/smpng/sys/dev/vt/hw/fb/vt_fb.h#5 integrate .. //depot/projects/smpng/sys/dev/vt/vt.h#9 integrate .. //depot/projects/smpng/sys/dev/vt/vt_buf.c#7 integrate .. //depot/projects/smpng/sys/dev/vt/vt_core.c#10 integrate .. //depot/projects/smpng/sys/dev/vx/if_vx.c#30 integrate .. //depot/projects/smpng/sys/dev/vxge/vxge.c#8 integrate .. //depot/projects/smpng/sys/dev/wb/if_wb.c#14 integrate .. //depot/projects/smpng/sys/dev/wl/if_wl.c#37 integrate .. //depot/projects/smpng/sys/dev/wpi/if_wpi.c#28 integrate .. //depot/projects/smpng/sys/dev/wtap/if_wtap.c#5 integrate .. //depot/projects/smpng/sys/dev/xe/if_xe.c#34 integrate .. //depot/projects/smpng/sys/dev/xen/netback/netback.c#15 integrate .. //depot/projects/smpng/sys/dev/xen/netfront/netfront.c#28 integrate .. //depot/projects/smpng/sys/dev/xl/if_xl.c#18 integrate .. //depot/projects/smpng/sys/fs/autofs/autofs.c#3 integrate .. //depot/projects/smpng/sys/geom/eli/g_eli.c#44 integrate .. //depot/projects/smpng/sys/i386/i386/pmap.c#176 integrate .. //depot/projects/smpng/sys/i386/linux/linux.h#36 integrate .. //depot/projects/smpng/sys/i386/linux/linux_machdep.c#60 integrate .. //depot/projects/smpng/sys/i386/linux/linux_proto.h#55 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscall.h#52 integrate .. //depot/projects/smpng/sys/i386/linux/linux_syscalls.c#8 integrate .. //depot/projects/smpng/sys/i386/linux/linux_sysent.c#56 integrate .. //depot/projects/smpng/sys/i386/linux/linux_systrace_args.c#8 integrate .. //depot/projects/smpng/sys/i386/linux/syscalls.master#59 integrate .. //depot/projects/smpng/sys/kern/kern_cpuset.c#21 integrate .. //depot/projects/smpng/sys/kern/kern_intr.c#119 integrate .. //depot/projects/smpng/sys/kern/sched_ule.c#135 integrate .. //depot/projects/smpng/sys/kern/vfs_syscalls.c#182 integrate .. //depot/projects/smpng/sys/mips/adm5120/if_admsw.c#11 integrate .. //depot/projects/smpng/sys/mips/atheros/if_arge.c#18 integrate .. //depot/projects/smpng/sys/mips/cavium/ciu.c#9 integrate .. //depot/projects/smpng/sys/mips/cavium/if_octm.c#8 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-rx.c#9 integrate .. //depot/projects/smpng/sys/mips/cavium/octe/ethernet-tx.c#8 integrate .. //depot/projects/smpng/sys/mips/idt/if_kr.c#11 integrate .. //depot/projects/smpng/sys/mips/nlm/dev/net/xlpge.c#6 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/nlge/if_nlge.c#9 integrate .. //depot/projects/smpng/sys/mips/rmi/dev/xlr/rge.c#12 integrate .. //depot/projects/smpng/sys/modules/bce/Makefile#4 integrate .. //depot/projects/smpng/sys/modules/bxe/Makefile#6 integrate .. //depot/projects/smpng/sys/modules/drm2/i915kms/Makefile#7 integrate .. //depot/projects/smpng/sys/modules/ixgbe/Makefile#16 integrate .. //depot/projects/smpng/sys/modules/linux/Makefile#38 integrate .. //depot/projects/smpng/sys/modules/rl/Makefile#5 integrate .. //depot/projects/smpng/sys/modules/zfs/Makefile#26 integrate .. //depot/projects/smpng/sys/net/if.c#162 integrate .. //depot/projects/smpng/sys/net/if_arcsubr.c#37 integrate .. //depot/projects/smpng/sys/net/if_atmsubr.c#36 integrate .. //depot/projects/smpng/sys/net/if_bridge.c#81 integrate .. //depot/projects/smpng/sys/net/if_debug.c#4 integrate .. //depot/projects/smpng/sys/net/if_disc.c#32 integrate .. //depot/projects/smpng/sys/net/if_edsc.c#5 integrate .. //depot/projects/smpng/sys/net/if_epair.c#15 integrate .. //depot/projects/smpng/sys/net/if_ethersubr.c#127 integrate .. //depot/projects/smpng/sys/net/if_faith.c#46 integrate .. //depot/projects/smpng/sys/net/if_fddisubr.c#47 integrate .. //depot/projects/smpng/sys/net/if_fwsubr.c#32 integrate .. //depot/projects/smpng/sys/net/if_gif.c#69 integrate .. //depot/projects/smpng/sys/net/if_gre.c#56 integrate .. //depot/projects/smpng/sys/net/if_iso88025subr.c#46 integrate .. //depot/projects/smpng/sys/net/if_lagg.c#38 integrate .. //depot/projects/smpng/sys/net/if_lagg.h#15 integrate .. //depot/projects/smpng/sys/net/if_loop.c#69 integrate .. //depot/projects/smpng/sys/net/if_mib.c#24 integrate .. //depot/projects/smpng/sys/net/if_spppfr.c#9 integrate .. //depot/projects/smpng/sys/net/if_spppsubr.c#55 integrate .. //depot/projects/smpng/sys/net/if_stf.c#64 integrate .. //depot/projects/smpng/sys/net/if_tap.c#68 integrate .. //depot/projects/smpng/sys/net/if_tun.c#87 integrate .. //depot/projects/smpng/sys/net/if_var.h#95 integrate .. //depot/projects/smpng/sys/net/if_vlan.c#90 integrate .. //depot/projects/smpng/sys/net/ifq.h#3 integrate .. //depot/projects/smpng/sys/net/rtsock.c#102 integrate .. //depot/projects/smpng/sys/net80211/ieee80211.c#62 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_adhoc.c#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_hostap.c#27 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_input.c#61 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_mesh.c#19 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_monitor.c#6 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_output.c#65 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_sta.c#28 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_superg.c#12 integrate .. //depot/projects/smpng/sys/net80211/ieee80211_wds.c#20 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/bt3c/ng_bt3c_pccard.c#17 integrate .. //depot/projects/smpng/sys/netgraph/bluetooth/drivers/h4/ng_h4.c#16 integrate .. //depot/projects/smpng/sys/netgraph/ng_device.c#24 integrate .. //depot/projects/smpng/sys/netgraph/ng_eiface.c#48 integrate .. //depot/projects/smpng/sys/netgraph/ng_iface.c#53 integrate .. //depot/projects/smpng/sys/netgraph/ng_ppp.c#33 integrate .. //depot/projects/smpng/sys/netgraph/ng_sppp.c#18 integrate .. //depot/projects/smpng/sys/netgraph/ng_tty.c#28 integrate .. //depot/projects/smpng/sys/netinet/in_pcb.c#123 integrate .. //depot/projects/smpng/sys/netinet/in_rss.c#5 integrate .. //depot/projects/smpng/sys/netinet/ip_gre.c#28 integrate .. //depot/projects/smpng/sys/netinet/ip_output.c#143 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.c#31 integrate .. //depot/projects/smpng/sys/netinet/sctp_auth.h#16 integrate .. //depot/projects/smpng/sys/netinet/sctp_cc_functions.c#13 integrate .. //depot/projects/smpng/sys/netinet/sctp_os_bsd.h#45 integrate .. //depot/projects/smpng/sys/netinet/sctp_output.c#66 integrate .. //depot/projects/smpng/sys/netinet/sctp_pcb.c#63 integrate .. //depot/projects/smpng/sys/netinet/sctp_structs.h#38 integrate .. //depot/projects/smpng/sys/netinet/sctp_usrreq.c#58 integrate .. //depot/projects/smpng/sys/netinet/sctputil.c#66 integrate .. //depot/projects/smpng/sys/netinet/tcp_input.c#165 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_input.c#34 integrate .. //depot/projects/smpng/sys/netipsec/ipsec_output.c#34 integrate .. //depot/projects/smpng/sys/netpfil/pf/if_pflog.c#5 integrate .. //depot/projects/smpng/sys/netpfil/pf/if_pfsync.c#11 integrate .. //depot/projects/smpng/sys/pci/if_rl.c#89 delete .. //depot/projects/smpng/sys/pci/if_rlreg.h#68 delete .. //depot/projects/smpng/sys/powerpc/powerpc/intr_machdep.c#33 integrate .. //depot/projects/smpng/sys/powerpc/ps3/if_glc.c#5 integrate .. //depot/projects/smpng/sys/powerpc/ps3/ps3_syscons.c#7 integrate .. //depot/projects/smpng/sys/powerpc/pseries/phyp_llan.c#3 integrate .. //depot/projects/smpng/sys/sparc64/pci/psycho.c#64 integrate .. //depot/projects/smpng/sys/sparc64/sparc64/intr_machdep.c#42 integrate .. //depot/projects/smpng/sys/sys/cpuset.h#15 integrate .. //depot/projects/smpng/sys/sys/interrupt.h#37 integrate .. //depot/projects/smpng/sys/sys/param.h#197 integrate .. //depot/projects/smpng/sys/sys/timex.h#7 integrate .. //depot/projects/smpng/sys/vm/vm_mmap.c#114 integrate .. //depot/projects/smpng/sys/x86/x86/intr_machdep.c#9 integrate Differences ... ==== //depot/projects/smpng/share/man/man9/Makefile#47 (text+ko) ==== @@ -1,4 +1,4 @@ -# $FreeBSD: head/share/man/man9/Makefile 270740 2014-08-28 04:35:38Z hselasky $ +# $FreeBSD: head/share/man/man9/Makefile 271761 2014-09-18 13:56:32Z trasz $ MAN= accept_filter.9 \ accf_data.9 \ @@ -1394,6 +1394,7 @@ taskqueue.9 TASK_INITIALIZER.9 \ taskqueue.9 taskqueue_block.9 \ taskqueue.9 taskqueue_cancel.9 \ + taskqueue.9 taskqueue_cancel_timeout.9 \ taskqueue.9 taskqueue_create.9 \ taskqueue.9 taskqueue_create_fast.9 \ taskqueue.9 TASKQUEUE_DECLARE.9 \ @@ -1401,14 +1402,20 @@ taskqueue.9 TASKQUEUE_DEFINE_THREAD.9 \ taskqueue.9 taskqueue_drain.9 \ taskqueue.9 taskqueue_drain_all.9 \ + taskqueue.9 taskqueue_drain_timeout.9 \ taskqueue.9 taskqueue_enqueue.9 \ taskqueue.9 taskqueue_enqueue_fast.9 \ + taskqueue.9 taskqueue_enqueue_timeout.9 \ taskqueue.9 TASKQUEUE_FAST_DEFINE.9 \ taskqueue.9 TASKQUEUE_FAST_DEFINE_THREAD.9 \ taskqueue.9 taskqueue_free.9 \ taskqueue.9 taskqueue_member.9 \ taskqueue.9 taskqueue_run.9 \ - taskqueue.9 taskqueue_unblock.9 + taskqueue.9 taskqueue_set_callback.9 \ + taskqueue.9 taskqueue_start_threads.9 \ + taskqueue.9 taskqueue_start_threads_pinned.9 \ + taskqueue.9 taskqueue_unblock.9 \ + taskqueue.9 TIMEOUT_TASK_INIT.9 MLINKS+=time.9 boottime.9 \ time.9 time_second.9 \ time.9 time_uptime.9 ==== //depot/projects/smpng/share/man/man9/SDT.9#5 (text+ko) ==== @@ -22,15 +22,17 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/SDT.9 267936 2014-06-26 21:44:30Z bapt $ +.\" $FreeBSD: head/share/man/man9/SDT.9 271819 2014-09-18 20:38:18Z smh $ .\" -.Dd August 17, 2013 +.Dd September 18, 2014 .Dt SDT 9 .Os .Sh NAME .Nm SDT .Nd a DTrace framework for adding statically-defined tracing probes .Sh SYNOPSIS +.In sys/param.h +.In sys/queue.h .In sys/sdt.h .Fn SDT_PROVIDER_DECLARE prov .Fn SDT_PROVIDER_DEFINE prov ==== //depot/projects/smpng/share/man/man9/altq.9#3 (text+ko) ==== @@ -26,7 +26,7 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: head/share/man/man9/altq.9 191251 2009-04-18 20:09:43Z rwatson $ +.\" $FreeBSD: head/share/man/man9/altq.9 271856 2014-09-19 09:01:19Z glebius $ .\" .Dd August 25, 2004 .Dt ALTQ 9 @@ -256,7 +256,6 @@ struct mbuf *ifq_tail; | struct mbuf *ifq_tail; int ifq_len; | int ifq_len; int ifq_maxlen; | int ifq_maxlen; - int ifq_drops; | int ifq_drops; }; | /* driver queue fields */ | ...... | /* altq related fields */ ==== //depot/projects/smpng/sys/amd64/amd64/fpu.c#34 (text+ko) ==== @@ -31,7 +31,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 271192 2014-09-06 15:23:28Z jhb $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/fpu.c 271747 2014-09-18 09:13:20Z kib $"); #include <sys/param.h> #include <sys/systm.h> @@ -362,7 +362,7 @@ stop_emulating(); fpusave(curpcb->pcb_save); start_emulating(); - PCPU_SET(fpcurthread, 0); + PCPU_SET(fpcurthread, NULL); } critical_exit(); } @@ -602,16 +602,21 @@ return (fpetable[(mxcsr & (~mxcsr >> 7)) & 0x3f]); } +static int err_count = 0; + /* - * Implement device not available (DNA) exception + * Device Not Available (DNA, #NM) exception handler. + * + * It would be better to switch FP context here (if curthread != + * fpcurthread) and not necessarily for every context switch, but it + * is too hard to access foreign pcb's. * - * It would be better to switch FP context here (if curthread != fpcurthread) - * and not necessarily for every context switch, but it is too hard to - * access foreign pcb's. + * The handler is entered with interrupts enabled, which allows the + * context switch to happen before critical enter() is executed, and + * causes restoration of FPU context on CPU other than that caused + * DNA. It is fine, since context switch started emulation on the + * current CPU as well. */ - -static int err_count = 0; - void fpudna(void) { @@ -625,11 +630,9 @@ return; } if (PCPU_GET(fpcurthread) != NULL) { - printf("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n", - PCPU_GET(fpcurthread), - PCPU_GET(fpcurthread)->td_proc->p_pid, - curthread, curthread->td_proc->p_pid); - panic("fpudna"); + panic("fpudna: fpcurthread = %p (%d), curthread = %p (%d)\n", + PCPU_GET(fpcurthread), PCPU_GET(fpcurthread)->td_tid, + curthread, curthread->td_tid); } stop_emulating(); /* ==== //depot/projects/smpng/sys/amd64/amd64/pmap.c#141 (text+ko) ==== @@ -79,7 +79,7 @@ #define AMD64_NPT_AWARE #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 270961 2014-09-02 04:11:20Z alc $"); +__FBSDID("$FreeBSD: head/sys/amd64/amd64/pmap.c 271716 2014-09-17 18:49:57Z kib $"); /* * Manages physical address maps. @@ -3845,7 +3845,8 @@ pt_entry_t *pte, PG_G, PG_M, PG_RW, PG_V; boolean_t anychanged, pv_lists_locked; - if ((prot & VM_PROT_READ) == VM_PROT_NONE) { + KASSERT((prot & ~VM_PROT_ALL) == 0, ("invalid prot %x", prot)); + if (prot == VM_PROT_NONE) { pmap_remove(pmap, sva, eva); return; } ==== //depot/projects/smpng/sys/amd64/linux32/linux.h#32 (text+ko) ==== @@ -27,7 +27,7 @@ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. * - * $FreeBSD: head/sys/amd64/linux32/linux.h 246085 2013-01-29 18:41:30Z jhb $ + * $FreeBSD: head/sys/amd64/linux32/linux.h 271743 2014-09-18 08:36:45Z bz $ */ #ifndef _AMD64_LINUX_H_ @@ -61,6 +61,11 @@ #define PTRIN(v) (void *)(uintptr_t)(v) #define PTROUT(v) (l_uintptr_t)(uintptr_t)(v) +#define CP(src,dst,fld) do { (dst).fld = (src).fld; } while (0) +#define CP2(src,dst,sfld,dfld) do { (dst).dfld = (src).sfld; } while (0) +#define PTRIN_CP(src,dst,fld) \ + do { (dst).fld = PTRIN((src).fld); } while (0) + /* * Provide a separate set of types for the Linux types. */ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_dummy.c#17 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/amd64/linux32/linux32_dummy.c 258541 2013-11-25 07:38:45Z attilio $"); +__FBSDID("$FreeBSD: head/sys/amd64/linux32/linux32_dummy.c 271743 2014-09-18 08:36:45Z bz $"); #include "opt_compat.h" @@ -73,11 +73,6 @@ DUMMY(epoll_ctl); DUMMY(epoll_wait); DUMMY(remap_file_pages); -DUMMY(timer_create); -DUMMY(timer_settime); -DUMMY(timer_gettime); -DUMMY(timer_getoverrun); -DUMMY(timer_delete); DUMMY(fstatfs64); DUMMY(mbind); DUMMY(get_mempolicy); ==== //depot/projects/smpng/sys/amd64/linux32/linux32_proto.h#37 (text+ko) ==== @@ -2,8 +2,8 @@ * System call prototypes. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_proto.h 255676 2013-09-18 18:49:26Z rdivacky $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky + * $FreeBSD: head/sys/amd64/linux32/linux32_proto.h 271744 2014-09-18 08:40:00Z bz $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz */ #ifndef _LINUX_SYSPROTO_H_ @@ -781,19 +781,25 @@ char tidptr_l_[PADL_(int *)]; int * tidptr; char tidptr_r_[PADR_(int *)]; }; struct linux_timer_create_args { - register_t dummy; + char clock_id_l_[PADL_(clockid_t)]; clockid_t clock_id; char clock_id_r_[PADR_(clockid_t)]; + char evp_l_[PADL_(struct sigevent *)]; struct sigevent * evp; char evp_r_[PADR_(struct sigevent *)]; + char timerid_l_[PADL_(l_timer_t *)]; l_timer_t * timerid; char timerid_r_[PADR_(l_timer_t *)]; }; struct linux_timer_settime_args { - register_t dummy; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; + char flags_l_[PADL_(l_int)]; l_int flags; char flags_r_[PADR_(l_int)]; + char new_l_[PADL_(const struct itimerspec *)]; const struct itimerspec * new; char new_r_[PADR_(const struct itimerspec *)]; + char old_l_[PADL_(struct itimerspec *)]; struct itimerspec * old; char old_r_[PADR_(struct itimerspec *)]; }; struct linux_timer_gettime_args { - register_t dummy; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; + char setting_l_[PADL_(struct itimerspec *)]; struct itimerspec * setting; char setting_r_[PADR_(struct itimerspec *)]; }; struct linux_timer_getoverrun_args { - register_t dummy; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; }; struct linux_timer_delete_args { - register_t dummy; + char timerid_l_[PADL_(l_timer_t)]; l_timer_t timerid; char timerid_r_[PADR_(l_timer_t)]; }; struct linux_clock_settime_args { char which_l_[PADL_(clockid_t)]; clockid_t which; char which_r_[PADR_(clockid_t)]; ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscall.h#36 (text+ko) ==== @@ -2,8 +2,8 @@ * System call numbers. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_syscall.h 255676 2013-09-18 18:49:26Z rdivacky $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky + * $FreeBSD: head/sys/amd64/linux32/linux32_syscall.h 271744 2014-09-18 08:40:00Z bz $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz */ #define LINUX_SYS_exit 1 ==== //depot/projects/smpng/sys/amd64/linux32/linux32_syscalls.c#7 (text+ko) ==== @@ -2,8 +2,8 @@ * System call names. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_syscalls.c 255676 2013-09-18 18:49:26Z rdivacky $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky + * $FreeBSD: head/sys/amd64/linux32/linux32_syscalls.c 271744 2014-09-18 08:40:00Z bz $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz */ const char *linux_syscallnames[] = { ==== //depot/projects/smpng/sys/amd64/linux32/linux32_sysent.c#39 (text+ko) ==== @@ -2,8 +2,8 @@ * System call switch table. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_sysent.c 255676 2013-09-18 18:49:26Z rdivacky $ - * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky + * $FreeBSD: head/sys/amd64/linux32/linux32_sysent.c 271744 2014-09-18 08:40:00Z bz $ + * created from FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz */ #include "opt_compat.h" @@ -278,11 +278,11 @@ { 0, (sy_call_t *)linux_epoll_wait, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 256 = linux_epoll_wait */ { 0, (sy_call_t *)linux_remap_file_pages, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 257 = linux_remap_file_pages */ { AS(linux_set_tid_address_args), (sy_call_t *)linux_set_tid_address, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 258 = linux_set_tid_address */ - { 0, (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 259 = linux_timer_create */ - { 0, (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 260 = linux_timer_settime */ - { 0, (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 261 = linux_timer_gettime */ - { 0, (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 262 = linux_timer_getoverrun */ - { 0, (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 263 = linux_timer_delete */ + { AS(linux_timer_create_args), (sy_call_t *)linux_timer_create, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 259 = linux_timer_create */ + { AS(linux_timer_settime_args), (sy_call_t *)linux_timer_settime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 260 = linux_timer_settime */ + { AS(linux_timer_gettime_args), (sy_call_t *)linux_timer_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 261 = linux_timer_gettime */ + { AS(linux_timer_getoverrun_args), (sy_call_t *)linux_timer_getoverrun, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 262 = linux_timer_getoverrun */ + { AS(linux_timer_delete_args), (sy_call_t *)linux_timer_delete, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 263 = linux_timer_delete */ { AS(linux_clock_settime_args), (sy_call_t *)linux_clock_settime, AUE_CLOCK_SETTIME, NULL, 0, 0, 0, SY_THR_STATIC }, /* 264 = linux_clock_settime */ { AS(linux_clock_gettime_args), (sy_call_t *)linux_clock_gettime, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 265 = linux_clock_gettime */ { AS(linux_clock_getres_args), (sy_call_t *)linux_clock_getres, AUE_NULL, NULL, 0, 0, 0, SY_THR_STATIC }, /* 266 = linux_clock_getres */ ==== //depot/projects/smpng/sys/amd64/linux32/linux32_systrace_args.c#7 (text+ko) ==== @@ -2,7 +2,7 @@ * System call argument to DTrace register array converstion. * * DO NOT EDIT-- this file is automatically generated. - * $FreeBSD: head/sys/amd64/linux32/linux32_systrace_args.c 255676 2013-09-18 18:49:26Z rdivacky $ + * $FreeBSD: head/sys/amd64/linux32/linux32_systrace_args.c 271744 2014-09-18 08:40:00Z bz $ * This file is part of the DTrace syscall provider. */ @@ -1720,27 +1720,43 @@ } /* linux_timer_create */ case 259: { - *n_args = 0; + struct linux_timer_create_args *p = params; + iarg[0] = p->clock_id; /* clockid_t */ + uarg[1] = (intptr_t) p->evp; /* struct sigevent * */ + uarg[2] = (intptr_t) p->timerid; /* l_timer_t * */ + *n_args = 3; break; } /* linux_timer_settime */ case 260: { - *n_args = 0; + struct linux_timer_settime_args *p = params; + iarg[0] = p->timerid; /* l_timer_t */ + iarg[1] = p->flags; /* l_int */ + uarg[2] = (intptr_t) p->new; /* const struct itimerspec * */ + uarg[3] = (intptr_t) p->old; /* struct itimerspec * */ + *n_args = 4; break; } /* linux_timer_gettime */ case 261: { - *n_args = 0; + struct linux_timer_gettime_args *p = params; + iarg[0] = p->timerid; /* l_timer_t */ + uarg[1] = (intptr_t) p->setting; /* struct itimerspec * */ + *n_args = 2; break; } /* linux_timer_getoverrun */ case 262: { - *n_args = 0; + struct linux_timer_getoverrun_args *p = params; + iarg[0] = p->timerid; /* l_timer_t */ + *n_args = 1; break; } /* linux_timer_delete */ case 263: { - *n_args = 0; + struct linux_timer_delete_args *p = params; + iarg[0] = p->timerid; /* l_timer_t */ + *n_args = 1; break; } /* linux_clock_settime */ @@ -4829,18 +4845,71 @@ break; /* linux_timer_create */ case 259: + switch(ndx) { + case 0: + p = "clockid_t"; + break; + case 1: + p = "struct sigevent *"; + break; + case 2: + p = "l_timer_t *"; + break; + default: + break; + }; break; /* linux_timer_settime */ case 260: + switch(ndx) { + case 0: + p = "l_timer_t"; + break; + case 1: + p = "l_int"; + break; + case 2: + p = "const struct itimerspec *"; + break; + case 3: + p = "struct itimerspec *"; + break; + default: + break; + }; break; /* linux_timer_gettime */ case 261: + switch(ndx) { + case 0: + p = "l_timer_t"; + break; + case 1: + p = "struct itimerspec *"; + break; + default: + break; + }; break; /* linux_timer_getoverrun */ case 262: + switch(ndx) { + case 0: + p = "l_timer_t"; + break; + default: + break; + }; break; /* linux_timer_delete */ case 263: + switch(ndx) { + case 0: + p = "l_timer_t"; + break; + default: + break; + }; break; /* linux_clock_settime */ case 264: @@ -6413,14 +6482,29 @@ break; /* linux_timer_create */ case 259: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timer_settime */ case 260: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timer_gettime */ case 261: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timer_getoverrun */ case 262: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_timer_delete */ case 263: + if (ndx == 0 || ndx == 1) + p = "int"; + break; /* linux_clock_settime */ case 264: if (ndx == 0 || ndx == 1) ==== //depot/projects/smpng/sys/amd64/linux32/syscalls.master#40 (text+ko) ==== @@ -1,4 +1,4 @@ - $FreeBSD: head/sys/amd64/linux32/syscalls.master 255675 2013-09-18 18:48:33Z rdivacky $ + $FreeBSD: head/sys/amd64/linux32/syscalls.master 271743 2014-09-18 08:36:45Z bz $ ; @(#)syscalls.master 8.1 (Berkeley) 7/19/93 ; System call name/number master file (or rather, slave, from LINUX). @@ -435,11 +435,13 @@ 256 AUE_NULL STD { int linux_epoll_wait(void); } 257 AUE_NULL STD { int linux_remap_file_pages(void); } 258 AUE_NULL STD { int linux_set_tid_address(int *tidptr); } -259 AUE_NULL STD { int linux_timer_create(void); } -260 AUE_NULL STD { int linux_timer_settime(void); } -261 AUE_NULL STD { int linux_timer_gettime(void); } -262 AUE_NULL STD { int linux_timer_getoverrun(void); } -263 AUE_NULL STD { int linux_timer_delete(void); } +259 AUE_NULL STD { int linux_timer_create(clockid_t clock_id, \ + struct sigevent *evp, l_timer_t *timerid); } +260 AUE_NULL STD { int linux_timer_settime(l_timer_t timerid, l_int flags, \ + const struct itimerspec *new, struct itimerspec *old); } +261 AUE_NULL STD { int linux_timer_gettime(l_timer_t timerid, struct itimerspec *setting); } +262 AUE_NULL STD { int linux_timer_getoverrun(l_timer_t timerid); } +263 AUE_NULL STD { int linux_timer_delete(l_timer_t timerid); } 264 AUE_CLOCK_SETTIME STD { int linux_clock_settime(clockid_t which, struct l_timespec *tp); } 265 AUE_NULL STD { int linux_clock_gettime(clockid_t which, struct l_timespec *tp); } 266 AUE_NULL STD { int linux_clock_getres(clockid_t which, struct l_timespec *tp); } ==== //depot/projects/smpng/sys/arm/allwinner/if_emac.c#2 (text+ko) ==== @@ -23,13 +23,13 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: head/sys/arm/allwinner/if_emac.c 263711 2014-03-25 08:31:47Z ganbold $ + * $FreeBSD: head/sys/arm/allwinner/if_emac.c 271859 2014-09-19 09:20:16Z glebius $ */ /* A10/A20 EMAC driver */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/arm/allwinner/if_emac.c 263711 2014-03-25 08:31:47Z ganbold $"); +__FBSDID("$FreeBSD: head/sys/arm/allwinner/if_emac.c 271859 2014-09-19 09:20:16Z glebius $"); #include <sys/param.h> #include <sys/systm.h> @@ -260,7 +260,7 @@ EMAC_ASSERT_LOCKED(sc); ifp = sc->emac_ifp; - ifp->if_opackets++; + if_inc_counter(ifp, IFCOUNTER_OPACKETS, 1); ifp->if_drv_flags &= ~IFF_DRV_OACTIVE; /* Unarm watchdog timer if no TX */ @@ -340,12 +340,12 @@ if_printf(ifp, "bad packet: len = %i status = %i\n", len, status); - ifp->if_ierrors++; + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); } #if 0 if (status & (EMAC_CRCERR | EMAC_LENERR)) { good_packet = 0; - ifp->if_ierrors++; + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); if (status & EMAC_CRCERR) if_printf(ifp, "crc error\n"); if (status & EMAC_LENERR) @@ -393,18 +393,18 @@ m0->m_next = m; m = m0; } else { - ifp->if_ierrors++; + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); m_freem(m); m = NULL; continue; } } else if (m->m_len > EMAC_MAC_MAXF) { - ifp->if_ierrors++; + if_inc_counter(ifp, IFCOUNTER_IERRORS, 1); m_freem(m); m = NULL; continue; } - ifp->if_ipackets++; + if_inc_counter(ifp, IFCOUNTER_IPACKETS, 1); EMAC_UNLOCK(sc); (*ifp->if_input)(ifp, m); EMAC_LOCK(sc); @@ -431,7 +431,7 @@ } else if_printf(sc->emac_ifp, "watchdog timeout -- resetting\n"); - ifp->if_oerrors++; + if_inc_counter(ifp, IFCOUNTER_OERRORS, 1); ifp->if_drv_flags &= ~IFF_DRV_RUNNING; emac_init_locked(sc); if (!IFQ_DRV_IS_EMPTY(&ifp->if_snd)) ==== //depot/projects/smpng/sys/arm/at91/if_ate.c#37 (text) ==== @@ -33,7 +33,7 @@ #include "opt_platform.h" #include <sys/cdefs.h> -__FBSDID("$FreeBSD: head/sys/arm/at91/if_ate.c 267589 2014-06-17 18:10:06Z jhb $"); +__FBSDID("$FreeBSD: head/sys/arm/at91/if_ate.c 271859 2014-09-19 09:20:16Z glebius $"); #include <sys/param.h> #include <sys/systm.h> @@ -776,19 +776,19 @@ sc->mibdata.dot3StatsAlignmentErrors += RD4(sc, ETH_ALE); sc->mibdata.dot3StatsFCSErrors += RD4(sc, ETH_SEQE); c = RD4(sc, ETH_SCOL); - ifp->if_collisions += c; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c); sc->mibdata.dot3StatsSingleCollisionFrames += c; c = RD4(sc, ETH_MCOL); sc->mibdata.dot3StatsMultipleCollisionFrames += c; - ifp->if_collisions += c; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c); sc->mibdata.dot3StatsSQETestErrors += RD4(sc, ETH_SQEE); sc->mibdata.dot3StatsDeferredTransmissions += RD4(sc, ETH_DTE); c = RD4(sc, ETH_LCOL); sc->mibdata.dot3StatsLateCollisions += c; - ifp->if_collisions += c; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c); c = RD4(sc, ETH_ECOL); sc->mibdata.dot3StatsExcessiveCollisions += c; - ifp->if_collisions += c; + if_inc_counter(ifp, IFCOUNTER_COLLISIONS, c); sc->mibdata.dot3StatsCarrierSenseErrors += RD4(sc, ETH_CSE); sc->mibdata.dot3StatsFrameTooLongs += RD4(sc, ETH_ELR); sc->mibdata.dot3StatsInternalMacReceiveErrors += RD4(sc, ETH_DRFC); @@ -797,9 +797,9 @@ * Not sure where to lump these, so count them against the errors * for the interface. */ - sc->ifp->if_oerrors += RD4(sc, ETH_TUE); - sc->ifp->if_ierrors += RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + - RD4(sc, ETH_USF); + if_inc_counter(sc->ifp, IFCOUNTER_OERRORS, RD4(sc, ETH_TUE)); + if_inc_counter(sc->ifp, IFCOUNTER_IERRORS, + RD4(sc, ETH_CDE) + RD4(sc, ETH_RJB) + RD4(sc, ETH_USF)); /* Schedule another timeout one second from now. */ callout_reset(&sc->tick_ch, hz, ate_tick, sc); @@ -914,7 +914,7 @@ mb = m_get2(remain + ETHER_ALIGN, M_NOWAIT, MT_DATA, M_PKTHDR); if (mb == NULL) { - sc->ifp->if_iqdrops++; + if_inc_counter(sc->ifp, IFCOUNTER_IQDROPS, 1); rxdhead->status = 0; continue; } @@ -957,7 +957,7 @@ >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201409191908.s8JJ8AfQ001424>