Date: Sat, 7 Nov 2009 14:47:26 GMT From: Gabor Pali <pgj@FreeBSD.org> To: Perforce Change Reviews <perforce@FreeBSD.org> Subject: PERFORCE change 170318 for review Message-ID: <200911071447.nA7ElQcn015333@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://p4web.freebsd.org/chv.cgi?CH=170318 Change 170318 by pgj@petymeg-current on 2009/11/07 14:46:27 IFC Affected files ... .. //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/UPDATING#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/getfacl/getfacl.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/ps/keyword.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/bin/sh/arith_lex.l#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/jail#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/games/fortune/datfiles/fortunes#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getflags.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_init.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/accept.2#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/mmap.2#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libkvm/kvm_i386.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libmemstat/Makefile#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_attach.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/lib/libstand/udp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/camcontrol/camcontrol.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/ddb/ddb_capture.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/mknod/mknod.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sbin/sysctl/sysctl.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/secure/usr.bin/bdes/bdes.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/chpmon.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/eltsub.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/eltsub.h#1 branch .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/getencstat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/getnobj.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/getobjmap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/getobjstat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/inienc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/sesd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/setencstat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/setobjstat.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man3/tree.3#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/ata.4#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man4/tty.4#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/ar.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/make.conf.5#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man5/msdosfs.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/man/man7/adding_user.7#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/misc/iso3166#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/zoneinfo/asia#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/zoneinfo/europe#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/share/zoneinfo/zone.tab#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/acpica/acpi_wakeup.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/identcpu.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/amd64/amd64/mp_machdep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/db_trace.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/gdb_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/arm/machdep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/at91/at91_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/mv/mv_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/mv/mv_sata.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/arm/sa11x0/assabet_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_all.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_all.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_da.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_pmp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/ata/ata_xpt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_ccb.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_periph.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_periph.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_xpt.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/cam_xpt_internal.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_da.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_sg.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cam/scsi/scsi_xpt.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/compat/opensolaris/sys/vnode.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vnops.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/cddl/contrib/opensolaris/uts/common/sys/vnode.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/linux/linux_ipc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/kern_ndis.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/kern_windrv.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_hal.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_ndis.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_ntoskrnl.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_pe.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/compat/ndis/subr_usbd.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/conf/files.ia64#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/contrib/altq/altq/altq_hfsc.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ahci/ahci.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/aic7xxx/aic79xx_pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an_isa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an_pccard.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_an_pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/an/if_anreg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-all.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-dma.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-lowlevel.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-pci.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-queue.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/ata-sata.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-adaptec.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-ahci.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-intel.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-marvell.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-nvidia.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-promise.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-serverworks.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ata/chipsets/ata-siliconimage.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ath/if_ath.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bge/if_bge.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/bge/if_bgereg.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/cxgb/cxgb_main.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drmP.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/drm_scatter.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/r600_blit.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/drm/radeon_cp.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fb/vesa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fb/vgareg.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/fdc/fdc.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/hatm/if_hatm.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/if_ndis/if_ndis.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/if_ndis/if_ndis_usb.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/isp/isp_sbus.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgb/if_ixgb.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgb/if_ixgb.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/ixgbe/ixgbe.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/brgphy.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/mii/miidevs#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/msk/if_msk.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/nfe/if_nfe.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/patm/if_patm_attach.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/pci/vga_pci.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/re/if_re.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/siis/siis.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sk/if_sk.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/stge/if_stge.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/sym/sym_hipd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/syscons/syscons.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/serial/usb_serial.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_compat_linux.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_compat_linux.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_core.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/usb_transfer.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/usb/wlan/if_urtw.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vge/if_vge.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/dev/vge/if_vgevar.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/fs/fifofs/fifo_vnops.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/ext2fs/ext2_inode_cnv.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/gnu/fs/ext2fs/ext2_vnops.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/bios/apm.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/i386/i386/identcpu.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/highfp.c#1 branch .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/interrupt.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/machdep.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/ia64/vm_machdep.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/md_var.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/ia64/include/proc.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/isa/vga_isa.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_idle.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_intr.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_lock.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/kern_sig.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sched_4bsd.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/sched_ule.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_log.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/subr_prf.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/uipc_syscalls.c#5 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_acl.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_default.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/kern/vfs_vnops.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net/if_ef.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/net80211/ieee80211.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_eiface.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_fec.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_iface.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netgraph/ng_sppp.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/ipfw/ip_dummynet.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet/tcp_output.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/netinet6/nd6.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/copyinout.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/swtch.S#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/aim/trap.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powerpc/cpu.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/powerpc/powerpc/stack_machdep.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/ata.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/conf.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/fbio.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/mman.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/msgbuf.h#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/proc.h#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/sys/signalvar.h#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/swap_pager.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_fault.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_map.c#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/sys/vm/vm_zeroidle.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/bsdiff/bsdiff/bsdiff.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/bsdiff/bspatch/bspatch.1#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/leave/leave.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/logger/logger.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.bin/tail/tail.1#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/crashinfo/crashinfo.sh#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/i2c/i2c.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/nfsd/stablerestart.5#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/usbconfig/dump.c#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/usbconfig/usbconfig.8#3 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/wake/wake.8#2 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/zic/zdump.c#4 integrate .. //depot/projects/soc2009/pgj_libstat/src/usr.sbin/zic/zic.8#4 integrate Differences ... ==== //depot/projects/soc2009/pgj_libstat/src/Makefile.inc1#3 (text+ko) ==== @@ -1,5 +1,5 @@ # -# $FreeBSD: src/Makefile.inc1,v 1.632 2009/10/28 07:05:32 edwin Exp $ +# $FreeBSD: src/Makefile.inc1,v 1.633 2009/11/01 08:20:30 rdivacky Exp $ # # Make command line options: # -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir @@ -272,7 +272,7 @@ LIB32CPUFLAGS= -march=${TARGET_CPUTYPE} .endif LIB32FLAGS= -m32 ${LIB32CPUFLAGS} -mfancy-math-387 -DCOMPAT_32BIT \ - -iprefix ${LIB32TMP}/usr/ \ + -isystem ${LIB32TMP}/usr/include/ \ -L${LIB32TMP}/usr/lib32 \ -B${LIB32TMP}/usr/lib32 ==== //depot/projects/soc2009/pgj_libstat/src/UPDATING#4 (text+ko) ==== @@ -537,6 +537,11 @@ # Map old usb library to new one for usb2 stack libusb-0.1.so.8 libusb20.so.1 +20090209: + All USB ethernet devices now attach as interfaces under the name ueN + (eg. ue0). This is to provide a predictable name as vendors often + change usb chipsets in a product without notice. + 20090203: The ichsmb(4) driver has been changed to require SMBus slave addresses be left-justified (xxxxxxx0b) rather than right-justified. @@ -1047,4 +1052,4 @@ Contact Warner Losh if you have any questions about your use of this document. -$FreeBSD: src/UPDATING,v 1.643 2009/10/26 09:16:08 mav Exp $ +$FreeBSD: src/UPDATING,v 1.644 2009/11/03 21:06:19 thompsa Exp $ ==== //depot/projects/soc2009/pgj_libstat/src/bin/getfacl/getfacl.1#3 (text+ko) ==== @@ -25,12 +25,12 @@ .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF .\" SUCH DAMAGE. .\" -.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.12 2009/09/04 10:22:29 trasz Exp $ +.\" $FreeBSD: src/bin/getfacl/getfacl.1,v 1.13 2009/11/02 12:35:38 brueffer Exp $ .\" .\" Developed by the TrustedBSD Project. .\" Support for POSIX.1e access control lists. .\" -.Dd September 04, 2009 +.Dd September 4, 2009 .Dt GETFACL 1 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/bin/ps/keyword.c#2 (text+ko) ==== @@ -33,7 +33,7 @@ #endif /* not lint */ #endif #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.79 2009/02/26 18:01:07 attilio Exp $"); +__FBSDID("$FreeBSD: src/bin/ps/keyword.c,v 1.80 2009/11/03 09:28:45 delphij Exp $"); #include <sys/param.h> #include <sys/time.h> @@ -70,7 +70,7 @@ /* PLEASE KEEP THE TABLE BELOW SORTED ALPHABETICALLY!!! */ static VAR var[] = { - {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 4, 0, CHAR, NULL, 0}, + {"%cpu", "%CPU", NULL, 0, pcpu, NULL, 5, 0, CHAR, NULL, 0}, {"%mem", "%MEM", NULL, 0, pmem, NULL, 4, 0, CHAR, NULL, 0}, {"acflag", "ACFLG", NULL, 0, kvar, NULL, 3, KOFF(ki_acflag), USHORT, "x", 0}, @@ -159,7 +159,7 @@ UINT, UIDFMT, 0}, {"rgroup", "RGROUP", NULL, LJUST|DSIZ, rgroupname, s_rgroupname, USERLEN, 0, CHAR, NULL, 0}, - {"rss", "RSS", NULL, 0, kvar, NULL, 5, KOFF(ki_rssize), PGTOK, "ld", 0}, + {"rss", "RSS", NULL, 0, kvar, NULL, 6, KOFF(ki_rssize), PGTOK, "ld", 0}, {"rtprio", "RTPRIO", NULL, 0, priorityr, NULL, 7, KOFF(ki_pri), CHAR, NULL, 0}, {"ruid", "RUID", NULL, 0, kvar, NULL, UIDLEN, KOFF(ki_ruid), @@ -207,7 +207,7 @@ NULL, 0}, {"usrpri", "", "upr", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, {"vsize", "", "vsz", 0, NULL, NULL, 0, 0, CHAR, NULL, 0}, - {"vsz", "VSZ", NULL, 0, vsize, NULL, 5, 0, CHAR, NULL, 0}, + {"vsz", "VSZ", NULL, 0, vsize, NULL, 6, 0, CHAR, NULL, 0}, {"wchan", "WCHAN", NULL, LJUST, wchan, NULL, 6, 0, CHAR, NULL, 0}, {"xstat", "XSTAT", NULL, 0, kvar, NULL, 4, KOFF(ki_xstat), USHORT, "x", 0}, ==== //depot/projects/soc2009/pgj_libstat/src/bin/sh/arith_lex.l#2 (text+ko) ==== @@ -38,7 +38,7 @@ #endif /* not lint */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.24 2005/08/13 07:59:46 stefanf Exp $"); +__FBSDID("$FreeBSD: src/bin/sh/arith_lex.l,v 1.25 2009/11/05 20:44:39 jilles Exp $"); #include <string.h> @@ -51,6 +51,13 @@ int yylex(void); +struct varname +{ + struct varname *next; + char name[1]; +}; +static struct varname *varnames; + #undef YY_INPUT #define YY_INPUT(buf,result,max) \ result = (*buf = *arith_buf++) ? 1 : YY_NULL; @@ -80,11 +87,14 @@ * If variable doesn't exist, we should initialize * it to zero. */ - char *temp; + struct varname *temp; if (lookupvar(yytext) == NULL) setvarsafe(yytext, "0", 0); - temp = (char *)ckmalloc(strlen(yytext) + 1); - yylval.s_value = strcpy(temp, yytext); + temp = ckmalloc(sizeof(struct varname) + + strlen(yytext)); + temp->next = varnames; + varnames = temp; + yylval.s_value = strcpy(temp->name, yytext); return ARITH_VAR; } @@ -130,5 +140,15 @@ void arith_lex_reset(void) { + struct varname *name, *next; + YY_NEW_FILE; + + name = varnames; + while (name != NULL) { + next = name->next; + ckfree(name); + name = next; + } + varnames = NULL; } ==== //depot/projects/soc2009/pgj_libstat/src/etc/rc.d/jail#3 (text+ko) ==== @@ -1,6 +1,6 @@ #!/bin/sh # -# $FreeBSD: src/etc/rc.d/jail,v 1.43 2009/06/10 18:18:14 ed Exp $ +# $FreeBSD: src/etc/rc.d/jail,v 1.44 2009/11/02 09:56:46 remko Exp $ # # PROVIDE: jail @@ -728,4 +728,4 @@ if [ -n "$*" ]; then jail_list="$*" fi -run_rc_command "${cmd}" +run_rc_command "${cmd}" & ==== //depot/projects/soc2009/pgj_libstat/src/games/fortune/datfiles/fortunes#3 (text+ko) ==== @@ -1,5 +1,5 @@ This fortune brought to you by: -$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.277 2009/10/06 02:13:32 dougb Exp $ +$FreeBSD: src/games/fortune/datfiles/fortunes,v 1.278 2009/11/04 18:40:05 dougb Exp $ % ======================================================================= || || @@ -25228,7 +25228,8 @@ -- Sylvestre Matuschka, "the Hungarian Train Wreck Freak", escaped prison 1937, not heard from since % -Iam +I +am not very happy ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.2 2008/07/28 09:36:56 ed Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawn.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWN 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn_file_actions_addopen.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.2 2008/07/28 09:36:56 ed Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_addopen.3,v 1.3 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWN_FILE_ACTIONS_ADDOPEN 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawn_file_actions_init.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawn_file_actions_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWN_FILE_ACTIONS_INIT 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getflags.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getflags.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETFLAGS 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getpgroup.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getpgroup.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETPGROUP 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getschedparam.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedparam.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSCHEDPARAM 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getschedpolicy.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getschedpolicy.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSCHEDPOLICY 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getsigdefault.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigdefault.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSIGDEFAULT 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_getsigmask.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_getsigmask.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_GETSIGMASK 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/gen/posix_spawnattr_init.3#2 (text+ko) ==== @@ -32,9 +32,9 @@ .\" the referee document. The original Standard can be obtained online at .\" http://www.opengroup.org/unix/online.html. .\" -.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_init.3,v 1.1 2008/07/28 02:22:19 davidxu Exp $ +.\" $FreeBSD: src/lib/libc/gen/posix_spawnattr_init.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd Mar 24, 2008 +.Dd March 24, 2008 .Dt POSIX_SPAWNATTR_INIT 3 .Os .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/accept.2#2 (text+ko) ==== @@ -26,7 +26,7 @@ .\" SUCH DAMAGE. .\" .\" @(#)accept.2 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.33 2008/06/20 14:47:06 phk Exp $ +.\" $FreeBSD: src/lib/libc/sys/accept.2,v 1.34 2009/11/02 07:21:13 cperciva Exp $ .\" .Dd December 11, 1993 .Dt ACCEPT 2 @@ -126,6 +126,10 @@ For some applications, performance may be enhanced by using an .Xr accept_filter 9 to pre-process incoming connections. +.Pp +Portable programs should not rely on the +.Dv O_NONBLOCK +property being inherited. .Sh RETURN VALUES The call returns \-1 on error. If it succeeds, it returns a non-negative ==== //depot/projects/soc2009/pgj_libstat/src/lib/libc/sys/mmap.2#3 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mmap.2 8.4 (Berkeley) 5/11/95 -.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.59 2009/07/26 06:38:56 alc Exp $ +.\" $FreeBSD: src/lib/libc/sys/mmap.2,v 1.60 2009/11/06 07:17:31 ed Exp $ .\" -.Dd July 26, 2009 +.Dd November 6, 2009 .Dt MMAP 2 .Os .Sh NAME @@ -108,6 +108,10 @@ argument is ignored. .\".It Dv MAP_FILE .\"Mapped from a regular file or character-special device memory. +.It Dv MAP_ANONYMOUS +This flag is identical to +.Dv MAP_ANON +and is provided for compatibility. .It Dv MAP_FIXED Do not permit the system to select a different address than the one specified. ==== //depot/projects/soc2009/pgj_libstat/src/lib/libkvm/kvm_i386.c#3 (text+ko) ==== @@ -32,7 +32,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.22 2009/06/14 12:42:06 ed Exp $"); +__FBSDID("$FreeBSD: src/lib/libkvm/kvm_i386.c,v 1.23 2009/11/06 13:10:12 jhb Exp $"); #if defined(LIBC_SCCS) && !defined(lint) #if 0 @@ -295,9 +295,9 @@ #define PG_FRAME4M (~PAGE4M_MASK) pde_pa = ((u_long)pde & PG_FRAME4M) + (va & PAGE4M_MASK); s = _kvm_pa2off(kd, pde_pa, &ofs); - if (s < sizeof pde) { - _kvm_syserr(kd, kd->program, - "_kvm_vatop: pde_pa not found"); + if (s == 0) { + _kvm_err(kd, kd->program, + "_kvm_vatop: 4MB page address not in dump"); goto invalid; } *pa = ofs; @@ -391,9 +391,9 @@ #define PG_FRAME2M (~PAGE2M_MASK) pde_pa = ((u_long)pde & PG_FRAME2M) + (va & PAGE2M_MASK); s = _kvm_pa2off(kd, pde_pa, &ofs); - if (s < sizeof pde) { - _kvm_syserr(kd, kd->program, - "_kvm_vatop_pae: pde_pa not found"); + if (s == 0) { + _kvm_err(kd, kd->program, + "_kvm_vatop: 2MB page address not in dump"); goto invalid; } *pa = ofs; ==== //depot/projects/soc2009/pgj_libstat/src/lib/libmemstat/Makefile#2 (text+ko) ==== @@ -1,8 +1,8 @@ -# $FreeBSD: src/lib/libmemstat/Makefile,v 1.6 2007/05/21 02:49:05 deischen Exp $ +# $FreeBSD: src/lib/libmemstat/Makefile,v 1.7 2009/07/19 17:25:24 kensmith Exp $ WARNS?= 3 LIB= memstat -SHLIB_MAJOR= 2 +SHLIB_MAJOR= 3 DPADD= ${LIBKVM} LDADD= -lkvm SRCS+= memstat.c ==== //depot/projects/soc2009/pgj_libstat/src/lib/libpmc/pmc_attach.3#2 (text+ko) ==== @@ -21,9 +21,9 @@ .\" out of the use of this software, even if advised of the possibility of .\" such damage. .\" -.\" $FreeBSD: src/lib/libpmc/pmc_attach.3,v 1.1 2007/11/25 06:38:55 jkoshy Exp $ +.\" $FreeBSD: src/lib/libpmc/pmc_attach.3,v 1.2 2009/11/02 12:35:38 brueffer Exp $ .\" -.Dd November 25 2007 +.Dd November 25, 2007 .Os .Dt PMC_ATTACH 3 .Sh NAME ==== //depot/projects/soc2009/pgj_libstat/src/lib/libstand/udp.c#2 (text+ko) ==== @@ -36,7 +36,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.6 2007/01/09 01:02:04 imp Exp $"); +__FBSDID("$FreeBSD: src/lib/libstand/udp.c,v 1.7 2009/11/05 06:08:04 marcel Exp $"); #include <sys/param.h> #include <sys/socket.h> @@ -90,7 +90,7 @@ ip->ip_hl = sizeof(*ip) >> 2; /* half-char */ ip->ip_len = htons(len); ip->ip_p = IPPROTO_UDP; /* char */ - ip->ip_ttl = IP_TTL; /* char */ + ip->ip_ttl = IPDEFTTL; /* char */ ip->ip_src = d->myip; ip->ip_dst = d->destip; ip->ip_sum = in_cksum(ip, sizeof(*ip)); /* short, but special */ ==== //depot/projects/soc2009/pgj_libstat/src/sbin/camcontrol/camcontrol.c#3 (text+ko) ==== @@ -27,7 +27,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.65 2009/09/27 22:00:26 mav Exp $"); +__FBSDID("$FreeBSD: src/sbin/camcontrol/camcontrol.c,v 1.67 2009/11/04 15:24:32 mav Exp $"); #include <sys/ioctl.h> #include <sys/stdint.h> @@ -186,7 +186,7 @@ char *combinedopt, int retry_count, int timeout); static int scsiinquiry(struct cam_device *device, int retry_count, int timeout); static int scsiserial(struct cam_device *device, int retry_count, int timeout); -static int scsixferrate(struct cam_device *device); +static int camxferrate(struct cam_device *device); #endif /* MINIMALISTIC */ static int parse_btl(char *tstr, int *bus, int *target, int *lun, cam_argmask *arglst); @@ -663,7 +663,7 @@ return(error); if (arglist & CAM_ARG_GET_XFERRATE) - error = scsixferrate(device); + error = camxferrate(device); return(error); } @@ -873,14 +873,18 @@ } static int -scsixferrate(struct cam_device *device) +camxferrate(struct cam_device *device) { + struct ccb_pathinq cpi; u_int32_t freq = 0; u_int32_t speed = 0; union ccb *ccb; u_int mb; int retval = 0; + if ((retval = get_cpi(device, &cpi)) != 0) + return (1); + ccb = cam_getccb(device); if (ccb == NULL) { @@ -913,6 +917,8 @@ } + speed = cpi.base_transfer_speed; + freq = 0; if (ccb->cts.transport == XPORT_SPI) { struct ccb_trans_settings_spi *spi = &ccb->cts.xport_specific.spi; @@ -920,31 +926,44 @@ if ((spi->valid & CTS_SPI_VALID_SYNC_RATE) != 0) { freq = scsi_calc_syncsrate(spi->sync_period); speed = freq; - } else { - struct ccb_pathinq cpi; - - retval = get_cpi(device, &cpi); - if (retval == 0) { - speed = cpi.base_transfer_speed; - freq = 0; - } } - - fprintf(stdout, "%s%d: ", device->device_name, - device->dev_unit_num); - if ((spi->valid & CTS_SPI_VALID_BUS_WIDTH) != 0) { speed *= (0x01 << spi->bus_width); } + } else if (ccb->cts.transport == XPORT_FC) { + struct ccb_trans_settings_fc *fc = + &ccb->cts.xport_specific.fc; - mb = speed / 1000; + if (fc->valid & CTS_FC_VALID_SPEED) + speed = fc->bitrate; + } else if (ccb->cts.transport == XPORT_SAS) { + struct ccb_trans_settings_sas *sas = + &ccb->cts.xport_specific.sas; + + if (sas->valid & CTS_SAS_VALID_SPEED) + speed = sas->bitrate; + } else if (ccb->cts.transport == XPORT_SATA) { + struct ccb_trans_settings_sata *sata = + &ccb->cts.xport_specific.sata; + + if (sata->valid & CTS_SATA_VALID_SPEED) + speed = sata->bitrate; + } + + mb = speed / 1000; + if (mb > 0) { + fprintf(stdout, "%s%d: %d.%03dMB/s transfers ", + device->device_name, device->dev_unit_num, + mb, speed % 1000); + } else { + fprintf(stdout, "%s%d: %dKB/s transfers ", + device->device_name, device->dev_unit_num, + speed); + } - if (mb > 0) - fprintf(stdout, "%d.%03dMB/s transfers ", - mb, speed % 1000); - else - fprintf(stdout, "%dKB/s transfers ", - speed); + if (ccb->cts.transport == XPORT_SPI) { + struct ccb_trans_settings_spi *spi = + &ccb->cts.xport_specific.spi; if (((spi->valid & CTS_SPI_VALID_SYNC_OFFSET) != 0) && (spi->sync_offset != 0)) @@ -964,25 +983,22 @@ && (spi->sync_offset != 0)) { fprintf(stdout, ")"); } - } else { - struct ccb_pathinq cpi; + } else if (ccb->cts.transport == XPORT_ATA) { + struct ccb_trans_settings_ata *ata = + &ccb->cts.xport_specific.ata; - retval = get_cpi(device, &cpi); + if (ata->valid & CTS_ATA_VALID_BYTECOUNT) { + fprintf(stdout, "(PIO size %dbytes)", + ata->bytecount); + } + } else if (ccb->cts.transport == XPORT_SATA) { + struct ccb_trans_settings_sata *sata = + &ccb->cts.xport_specific.sata; - if (retval != 0) - goto xferrate_bailout; - - speed = cpi.base_transfer_speed; - freq = 0; - - mb = speed / 1000; - - if (mb > 0) - fprintf(stdout, "%d.%03dMB/s transfers ", - mb, speed % 1000); - else - fprintf(stdout, "%dKB/s transfers ", - speed); + if (sata->valid & CTS_SATA_VALID_BYTECOUNT) { + fprintf(stdout, "(PIO size %dbytes)", + sata->bytecount); + } } if (ccb->cts.protocol == PROTO_SCSI) { @@ -1045,6 +1061,10 @@ printf("cylinders %d\n", parm->cylinders); printf("heads %d\n", parm->heads); printf("sectors/track %d\n", parm->sectors); + printf("sector size logical %u, physical %lu, offset %lu\n", + ata_logical_sector_size(parm), + (unsigned long)ata_physical_sector_size(parm), + (unsigned long)ata_logical_sector_offset(parm)); if (parm->config == ATA_PROTO_CFA || (parm->support.command2 & ATA_SUPPORT_CFA)) @@ -1305,6 +1325,7 @@ fprintf(stdout, "%s%d: ", device->device_name, device->dev_unit_num); ata_print_ident(ident_buf); + camxferrate(device); atacapprint(ident_buf); free(ident_buf); ==== //depot/projects/soc2009/pgj_libstat/src/sbin/ddb/ddb_capture.c#3 (text+ko) ==== @@ -25,7 +25,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.2 2009/10/29 13:44:58 jhb Exp $"); +__FBSDID("$FreeBSD: src/sbin/ddb/ddb_capture.c,v 1.3 2009/11/02 20:18:50 jhb Exp $"); #include <sys/types.h> #include <sys/sysctl.h> @@ -204,6 +204,7 @@ mflag = NULL; nflag = NULL; + kvm = NULL; while ((ch = getopt(argc, argv, "M:N:")) != -1) { switch (ch) { case 'M': ==== //depot/projects/soc2009/pgj_libstat/src/sbin/mknod/mknod.8#2 (text+ko) ==== @@ -26,9 +26,9 @@ .\" SUCH DAMAGE. .\" .\" @(#)mknod.8 8.2 (Berkeley) 12/11/93 -.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.31 2005/02/10 09:19:30 ru Exp $ +.\" $FreeBSD: src/sbin/mknod/mknod.8,v 1.33 2009/11/01 18:25:11 brueffer Exp $ .\" -.Dd December 15, 2004 +.Dd October 31, 2009 .Dt MKNOD 8 .Os .Sh NAME @@ -74,9 +74,6 @@ .It Ar major The major device number is an integer number which tells the kernel which device driver entry point to use. -To learn what -major device number to use for a particular device, check -.Pa /usr/src/sys/conf/majors . .It Ar minor The minor device number tells the kernel which subunit the node corresponds to on the device; for example, ==== //depot/projects/soc2009/pgj_libstat/src/sbin/sysctl/sysctl.c#3 (text+ko) ==== @@ -38,7 +38,7 @@ static char sccsid[] = "@(#)from: sysctl.c 8.1 (Berkeley) 6/6/93"; #endif static const char rcsid[] = - "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.91 2009/10/21 18:31:54 ed Exp $"; + "$FreeBSD: src/sbin/sysctl/sysctl.c,v 1.92 2009/11/03 11:41:21 ed Exp $"; #endif /* not lint */ #include <sys/param.h> @@ -419,14 +419,7 @@ warnx("T_dev_T %d != %d", l2, sizeof(*d)); return (1); } - if ((int)(*d) != -1) { - if (minor(*d) > 255 || minor(*d) < 0) - printf("{ major = %d, minor = 0x%x }", - major(*d), minor(*d)); - else - printf("{ major = %d, minor = %d }", - major(*d), minor(*d)); - } + printf("%s", devname(*d, S_IFCHR)); return (0); } ==== //depot/projects/soc2009/pgj_libstat/src/secure/usr.bin/bdes/bdes.c#2 (text+ko) ==== @@ -81,7 +81,7 @@ */ #include <sys/cdefs.h> -__FBSDID("$FreeBSD: src/secure/usr.bin/bdes/bdes.c,v 1.10 2008/02/19 07:09:18 ru Exp $"); +__FBSDID("$FreeBSD: src/secure/usr.bin/bdes/bdes.c,v 1.11 2009/11/03 18:40:42 jhb Exp $"); #include <sys/types.h> @@ -170,11 +170,11 @@ int i; /* counter in a for loop */ char *p; /* used to obtain the key */ DES_cblock msgbuf; /* I/O buffer */ - int kflag; /* command-line encryptiooon key */ + int kflag; /* command-line encryption key */ setproctitle("-"); /* Hide command-line arguments */ - /* initialize the initialization vctor */ + /* initialize the initialization vector */ MEMZERO(ivec, 8); /* process the argument list */ ==== //depot/projects/soc2009/pgj_libstat/src/share/examples/ses/srcs/chpmon.c#2 (text+ko) ==== @@ -1,4 +1,4 @@ -/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.1 2000/02/29 05:44:16 mjacob Exp $ */ +/* $FreeBSD: src/share/examples/ses/srcs/chpmon.c,v 1.2 2009/11/04 23:36:23 delphij Exp $ */ /* * Copyright (c) 2000 by Matthew Jacob * All rights reserved. @@ -47,9 +47,7 @@ #define BADSTAT \ (SES_ENCSTAT_UNRECOV|SES_ENCSTAT_CRITICAL|SES_ENCSTAT_NONCRITICAL) int -main(a, v) - int a; - char **v; >>> TRUNCATED FOR MAIL (1000 lines) <<<
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200911071447.nA7ElQcn015333>