PERFORCE change 207137 for review
Oleksandr Tymoshenko
gonzo at FreeBSD.org
Thu Mar 1 02:02:28 UTC 2012
http://p4web.freebsd.org/@@207137?ac=10
Change 207137 by gonzo at gonzo_thinkpad on 2012/03/01 02:02:16
IFC @207136
Affected files ...
.. //depot/projects/dtrace-mips/Makefile.inc1#3 edit
.. //depot/projects/dtrace-mips/ObsoleteFiles.inc#2 integrate
.. //depot/projects/dtrace-mips/UPDATING#2 integrate
.. //depot/projects/dtrace-mips/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 integrate
.. //depot/projects/dtrace-mips/contrib/top/top.c#2 integrate
.. //depot/projects/dtrace-mips/etc/devd/apple.conf#2 integrate
.. //depot/projects/dtrace-mips/gnu/usr.bin/cc/c++/Makefile#2 integrate
.. //depot/projects/dtrace-mips/gnu/usr.bin/cc/cc/Makefile#2 integrate
.. //depot/projects/dtrace-mips/gnu/usr.bin/cc/cpp/Makefile#2 integrate
.. //depot/projects/dtrace-mips/gnu/usr.bin/cc/cpp/gcpp.1#1 branch
.. //depot/projects/dtrace-mips/lib/libc/sys/getsockopt.2#2 integrate
.. //depot/projects/dtrace-mips/lib/libsm/Makefile#2 integrate
.. //depot/projects/dtrace-mips/lib/libthr/thread/thr_rwlock.c#2 integrate
.. //depot/projects/dtrace-mips/lib/libthr/thread/thr_umtx.c#2 integrate
.. //depot/projects/dtrace-mips/lib/libthr/thread/thr_umtx.h#2 integrate
.. //depot/projects/dtrace-mips/lib/libthread_db/Makefile#2 integrate
.. //depot/projects/dtrace-mips/lib/libz/Makefile#2 integrate
.. //depot/projects/dtrace-mips/libexec/mail.local/Makefile#2 integrate
.. //depot/projects/dtrace-mips/libexec/smrsh/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sbin/fsdb/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sbin/ifconfig/ifconfig.8#2 integrate
.. //depot/projects/dtrace-mips/sbin/ipfw/ipfw.8#2 integrate
.. //depot/projects/dtrace-mips/share/man/man4/ath.4#2 integrate
.. //depot/projects/dtrace-mips/share/man/man4/mos.4#2 integrate
.. //depot/projects/dtrace-mips/share/man/man4/net80211.4#2 integrate
.. //depot/projects/dtrace-mips/share/man/man4/netmap.4#2 integrate
.. //depot/projects/dtrace-mips/share/man/man4/usb.4#2 integrate
.. //depot/projects/dtrace-mips/share/man/man5/devfs.5#2 integrate
.. //depot/projects/dtrace-mips/share/man/man5/passwd.5#2 integrate
.. //depot/projects/dtrace-mips/share/man/man5/rc.conf.5#2 integrate
.. //depot/projects/dtrace-mips/share/man/man5/src.conf.5#2 integrate
.. //depot/projects/dtrace-mips/share/man/man9/byteorder.9#2 integrate
.. //depot/projects/dtrace-mips/share/man/man9/sysctl.9#2 integrate
.. //depot/projects/dtrace-mips/share/misc/committers-doc.dot#2 integrate
.. //depot/projects/dtrace-mips/share/mk/bsd.own.mk#2 integrate
.. //depot/projects/dtrace-mips/share/mk/bsd.sys.mk#2 integrate
.. //depot/projects/dtrace-mips/sys/amd64/amd64/cpu_switch.S#2 integrate
.. //depot/projects/dtrace-mips/sys/amd64/include/_limits.h#2 integrate
.. //depot/projects/dtrace-mips/sys/amd64/include/_stdint.h#2 integrate
.. //depot/projects/dtrace-mips/sys/amd64/include/_types.h#2 integrate
.. //depot/projects/dtrace-mips/sys/amd64/include/cpufunc.h#2 integrate
.. //depot/projects/dtrace-mips/sys/amd64/include/endian.h#2 integrate
.. //depot/projects/dtrace-mips/sys/amd64/include/segments.h#2 integrate
.. //depot/projects/dtrace-mips/sys/amd64/include/setjmp.h#2 integrate
.. //depot/projects/dtrace-mips/sys/amd64/include/stdarg.h#2 integrate
.. //depot/projects/dtrace-mips/sys/arm/mv/mv_machdep.c#2 integrate
.. //depot/projects/dtrace-mips/sys/arm/xscale/i8134x/crb_machdep.c#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/boot0/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/boot2/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/btx/btx/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/btx/btxldr/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/gptboot/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/gptzfsboot/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/libi386/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/libi386/vidconsole.c#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/pxeldr/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/i386/zfsboot/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/pc98/btx/btx/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/boot/pc98/btx/btxldr/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c#2 integrate
.. //depot/projects/dtrace-mips/sys/compat/linprocfs/linprocfs.c#2 integrate
.. //depot/projects/dtrace-mips/sys/compat/linsysfs/linsysfs.c#2 integrate
.. //depot/projects/dtrace-mips/sys/conf/Makefile.amd64#2 integrate
.. //depot/projects/dtrace-mips/sys/conf/Makefile.i386#2 integrate
.. //depot/projects/dtrace-mips/sys/conf/NOTES#2 integrate
.. //depot/projects/dtrace-mips/sys/conf/files.powerpc#2 integrate
.. //depot/projects/dtrace-mips/sys/conf/kern.mk#2 integrate
.. //depot/projects/dtrace-mips/sys/conf/kern.pre.mk#2 integrate
.. //depot/projects/dtrace-mips/sys/conf/kmod.mk#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/aac/aac_pci.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/acpi_support/atk0110.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/amr/amr_pci.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/ath/if_ath_sysctl.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/dpt/dpt_scsi.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/e1000/if_em.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/e1000/if_igb.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/e1000/if_lem.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/isci/isci.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/ixgbe/ixgbe.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/mii/rgephy.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/mlx/mlx.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/netmap/if_em_netmap.h#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/netmap/if_igb_netmap.h#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/netmap/if_lem_netmap.h#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/netmap/if_re_netmap.h#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/netmap/ixgbe_netmap.h#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/netmap/netmap.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/netmap/netmap_kern.h#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/pci/pci.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/pcn/if_pcn.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/re/if_re.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/sf/if_sfreg.h#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/siba/siba_core.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/usb/net/if_mos.c#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/usb/net/if_mosreg.h#2 integrate
.. //depot/projects/dtrace-mips/sys/dev/usb/usbdevs#2 integrate
.. //depot/projects/dtrace-mips/sys/fs/devfs/devfs_vfsops.c#2 integrate
.. //depot/projects/dtrace-mips/sys/fs/nullfs/null_subr.c#2 integrate
.. //depot/projects/dtrace-mips/sys/fs/nullfs/null_vfsops.c#2 integrate
.. //depot/projects/dtrace-mips/sys/fs/nullfs/null_vnops.c#2 integrate
.. //depot/projects/dtrace-mips/sys/fs/procfs/procfs.c#2 integrate
.. //depot/projects/dtrace-mips/sys/fs/pseudofs/pseudofs.h#2 integrate
.. //depot/projects/dtrace-mips/sys/i386/i386/trap.c#2 integrate
.. //depot/projects/dtrace-mips/sys/i386/include/_limits.h#2 integrate
.. //depot/projects/dtrace-mips/sys/i386/include/_stdint.h#2 integrate
.. //depot/projects/dtrace-mips/sys/i386/include/_types.h#2 integrate
.. //depot/projects/dtrace-mips/sys/i386/include/apicvar.h#2 integrate
.. //depot/projects/dtrace-mips/sys/i386/include/endian.h#2 integrate
.. //depot/projects/dtrace-mips/sys/i386/include/segments.h#2 integrate
.. //depot/projects/dtrace-mips/sys/i386/include/setjmp.h#2 integrate
.. //depot/projects/dtrace-mips/sys/i386/include/stdarg.h#2 integrate
.. //depot/projects/dtrace-mips/sys/ia64/ia64/machdep.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/kern_fork.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/kern_jail.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/kern_proc.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/kern_umtx.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/sched_ule.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/subr_bus.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/subr_syscall.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/sys_pipe.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/tty.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/uipc_socket.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/uipc_usrreq.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/vfs_bio.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/vfs_default.c#2 integrate
.. //depot/projects/dtrace-mips/sys/kern/vnode_if.src#2 integrate
.. //depot/projects/dtrace-mips/sys/mips/cavium/files.octeon1#2 integrate
.. //depot/projects/dtrace-mips/sys/mips/cavium/if_octm.c#2 integrate
.. //depot/projects/dtrace-mips/sys/mips/cavium/octe/ethernet-common.c#2 integrate
.. //depot/projects/dtrace-mips/sys/mips/rt305x/rt305x_sysctl.c#2 integrate
.. //depot/projects/dtrace-mips/sys/modules/bios/smapi/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/modules/linux/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/modules/scc/Makefile#2 integrate
.. //depot/projects/dtrace-mips/sys/net/if_bridge.c#2 integrate
.. //depot/projects/dtrace-mips/sys/net/netmap.h#2 integrate
.. //depot/projects/dtrace-mips/sys/net/netmap_user.h#2 integrate
.. //depot/projects/dtrace-mips/sys/net80211/ieee80211_input.c#2 integrate
.. //depot/projects/dtrace-mips/sys/net80211/ieee80211_ioctl.h#2 integrate
.. //depot/projects/dtrace-mips/sys/net80211/ieee80211_sta.c#2 integrate
.. //depot/projects/dtrace-mips/sys/netatalk/aarp.c#2 integrate
.. //depot/projects/dtrace-mips/sys/netinet/ipfw/ip_fw_dynamic.c#2 integrate
.. //depot/projects/dtrace-mips/sys/pc98/include/_limits.h#2 integrate
.. //depot/projects/dtrace-mips/sys/pc98/include/_stdint.h#2 integrate
.. //depot/projects/dtrace-mips/sys/pc98/include/_types.h#2 integrate
.. //depot/projects/dtrace-mips/sys/pc98/include/endian.h#2 integrate
.. //depot/projects/dtrace-mips/sys/pc98/include/setjmp.h#2 integrate
.. //depot/projects/dtrace-mips/sys/pc98/include/stdarg.h#2 integrate
.. //depot/projects/dtrace-mips/sys/powerpc/conf/GENERIC#2 integrate
.. //depot/projects/dtrace-mips/sys/powerpc/conf/GENERIC64#2 integrate
.. //depot/projects/dtrace-mips/sys/powerpc/powermac/atibl.c#1 branch
.. //depot/projects/dtrace-mips/sys/sys/jail.h#2 integrate
.. //depot/projects/dtrace-mips/sys/sys/proc.h#2 integrate
.. //depot/projects/dtrace-mips/sys/sys/rman.h#2 integrate
.. //depot/projects/dtrace-mips/sys/sys/socket.h#2 integrate
.. //depot/projects/dtrace-mips/sys/sys/sysctl.h#2 integrate
.. //depot/projects/dtrace-mips/sys/sys/vnode.h#2 integrate
.. //depot/projects/dtrace-mips/sys/vm/vm_kern.c#2 integrate
.. //depot/projects/dtrace-mips/sys/x86/cpufreq/p4tcc.c#2 integrate
.. //depot/projects/dtrace-mips/sys/x86/include/_limits.h#1 branch
.. //depot/projects/dtrace-mips/sys/x86/include/_stdint.h#1 branch
.. //depot/projects/dtrace-mips/sys/x86/include/_types.h#1 branch
.. //depot/projects/dtrace-mips/sys/x86/include/endian.h#1 branch
.. //depot/projects/dtrace-mips/sys/x86/include/setjmp.h#1 branch
.. //depot/projects/dtrace-mips/sys/x86/include/stdarg.h#1 branch
.. //depot/projects/dtrace-mips/sys/x86/x86/busdma_machdep.c#2 integrate
.. //depot/projects/dtrace-mips/sys/x86/x86/local_apic.c#2 integrate
.. //depot/projects/dtrace-mips/sys/xen/interface/io/blkif.h#2 integrate
.. //depot/projects/dtrace-mips/tools/build/options/WITH_CLANG_IS_CC#1 branch
.. //depot/projects/dtrace-mips/tools/regression/fifo/fifo_misc/fifo_misc.c#2 integrate
.. //depot/projects/dtrace-mips/tools/regression/security/cap_test/cap_test_capmode.c#2 integrate
.. //depot/projects/dtrace-mips/tools/tools/net80211/wlanstats/wlanstats.c#2 integrate
.. //depot/projects/dtrace-mips/tools/tools/netmap/bridge.c#2 integrate
.. //depot/projects/dtrace-mips/tools/tools/netmap/pcap.c#2 integrate
.. //depot/projects/dtrace-mips/tools/tools/netmap/pkt-gen.c#2 integrate
.. //depot/projects/dtrace-mips/usr.bin/clang/clang/Makefile#2 integrate
.. //depot/projects/dtrace-mips/usr.bin/csup/auth.c#2 integrate
.. //depot/projects/dtrace-mips/usr.bin/fetch/fetch.1#2 integrate
.. //depot/projects/dtrace-mips/usr.bin/fstat/fstat.c#2 integrate
.. //depot/projects/dtrace-mips/usr.bin/netstat/Makefile#2 integrate
.. //depot/projects/dtrace-mips/usr.bin/procstat/procstat.1#2 integrate
.. //depot/projects/dtrace-mips/usr.bin/procstat/procstat_cred.c#2 integrate
.. //depot/projects/dtrace-mips/usr.bin/vacation/Makefile#2 integrate
.. //depot/projects/dtrace-mips/usr.bin/xargs/xargs.c#2 integrate
.. //depot/projects/dtrace-mips/usr.sbin/bsdinstall/distextract/distextract.c#2 integrate
.. //depot/projects/dtrace-mips/usr.sbin/bsdinstall/distfetch/distfetch.c#2 integrate
.. //depot/projects/dtrace-mips/usr.sbin/cron/crontab/crontab.c#2 integrate
.. //depot/projects/dtrace-mips/usr.sbin/jail/jail.8#2 integrate
.. //depot/projects/dtrace-mips/usr.sbin/sendmail/Makefile#2 integrate
.. //depot/projects/dtrace-mips/usr.sbin/tzsetup/tzsetup.8#2 integrate
Differences ...
==== //depot/projects/dtrace-mips/Makefile.inc1#3 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/Makefile.inc1,v 1.724 2012/01/30 20:19:28 imp Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.725 2012/02/29 22:58:51 dim Exp $
#
# Make command line options:
# -DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -1054,7 +1054,9 @@
usr.bin/clang/clang-tblgen
.endif
-.if ${MK_CDDL} != "no"
+.if ${MK_CDDL} != "no" && \
+ ${BOOTSTRAPPING} < 800038 && \
+ !(${BOOTSTRAPPING} >= 700112 && ${BOOTSTRAPPING} < 799999)
_dtrace_tools= cddl/usr.bin/sgsmsg cddl/lib/libctf lib/libelf \
lib/libdwarf cddl/usr.bin/ctfconvert cddl/usr.bin/ctfmerge
.endif
@@ -1106,6 +1108,10 @@
_share= share/syscons/scrnmaps
.endif
+.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang")
+_gcc_tools= gnu/usr.bin/cc/cc_tools
+.endif
+
.if ${MK_KERBEROS} != "no"
_kerberos5_tools= kerberos5/tools
.endif
@@ -1134,7 +1140,7 @@
${MAKE} DIRPRFX=${_tool}/ build-tools
.endfor
.for _tool in \
- gnu/usr.bin/cc/cc_tools \
+ ${_gcc_tools} \
${_kerberos5_tools}
${_+_}@${ECHODIR} "===> ${_tool} (obj,depend,all)"; \
cd ${.CURDIR}/${_tool}; \
@@ -1164,14 +1170,12 @@
_binutils= gnu/usr.bin/binutils
.endif
-.if ${MK_CLANG} != "no"
-.if ${CC:T:Mclang} == "clang"
+.if ${MK_CLANG} != "no" && (${MK_CLANG_IS_CC} != "no" || ${CC:T:Mclang} == "clang")
_clang= usr.bin/clang
_clang_libs= lib/clang
.endif
-.endif
-.if ${MK_GCC} != "no"
+.if ${MK_GCC} != "no" && (${MK_CLANG_IS_CC} == "no" && ${CC:T:Mclang} != "clang")
_cc= gnu/usr.bin/cc
.endif
==== //depot/projects/dtrace-mips/ObsoleteFiles.inc#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.291 2012/02/25 10:58:02 mm Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.293 2012/02/28 14:35:36 pluknet Exp $
#
# This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
# directories (OLD_DIRS) which should get removed at an update. Recently
@@ -39,23 +39,26 @@
# done
# 20120225: libarchive 3.0.3
-OLD_FILES+=man/man3/archive_read_data_into_buffer.3.gz \
- man/man3/archive_read_support_compression_all.3.gz \
- man/man3/archive_read_support_compression_bzip2.3.gz \
- man/man3/archive_read_support_compression_compress.3.gz \
- man/man3/archive_read_support_compression_gzip.3.gz \
- man/man3/archive_read_support_compression_lzma.3.gz \
- man/man3/archive_read_support_compression_none.3.gz \
- man/man3/archive_read_support_compression_program.3.gz \
- man/man3/archive_read_support_compression_program_signature.3.gz \
- man/man3/archive_read_support_compression_xz.3.gz \
- man/man3/archive_write_set_callbacks.3.gz \
- man/man3/archive_write_set_compression_bzip2.3.gz \
- man/man3/archive_write_set_compression_compress.3.gz \
- man/man3/archive_write_set_compression_gzip.3.gz \
- man/man3/archive_write_set_compression_none.3.gz \
- man/man3/archive_write_set_compression_program.3.gz
+OLD_FILES+=usr/share/man/man3/archive_read_data_into_buffer.3.gz \
+ usr/share/man/man3/archive_read_support_compression_all.3.gz \
+ usr/share/man/man3/archive_read_support_compression_bzip2.3.gz \
+ usr/share/man/man3/archive_read_support_compression_compress.3.gz \
+ usr/share/man/man3/archive_read_support_compression_gzip.3.gz \
+ usr/share/man/man3/archive_read_support_compression_lzma.3.gz \
+ usr/share/man/man3/archive_read_support_compression_none.3.gz \
+ usr/share/man/man3/archive_read_support_compression_program.3.gz \
+ usr/share/man/man3/archive_read_support_compression_program_signature.3.gz \
+ usr/share/man/man3/archive_read_support_compression_xz.3.gz \
+ usr/share/man/man3/archive_write_set_callbacks.3.gz \
+ usr/share/man/man3/archive_write_set_compression_bzip2.3.gz \
+ usr/share/man/man3/archive_write_set_compression_compress.3.gz \
+ usr/share/man/man3/archive_write_set_compression_gzip.3.gz \
+ usr/share/man/man3/archive_write_set_compression_none.3.gz \
+ usr/share/man/man3/archive_write_set_compression_program.3.gz
OLD_LIBS+=usr/lib/libarchive.so.5
+.if ${TARGET_ARCH} == "amd64" || ${TARGET_ARCH} == "powerpc64"
+OLD_LIBS+=usr/lib32/libarchive.so.5
+.endif
# 20120113: removal of wtmpcvt(1)
OLD_FILES+=usr/bin/wtmpcvt
OLD_FILES+=usr/share/man/man1/wtmpcvt.1.gz
==== //depot/projects/dtrace-mips/UPDATING#2 (text+ko) ====
@@ -22,6 +22,14 @@
machines to maximize performance. (To disable malloc debugging, run
ln -s aj /etc/malloc.conf.)
+20120229:
+ Now unix domain sockets behave "as expected" on nullfs(5). Previously
+ nullfs(5) did not pass through all behaviours to the underlying layer,
+ as a result if we bound to a socket on the lower layer we could connect
+ only to the lower path; if we bound to the upper layer we could connect
+ only to the upper path. The new behavior is one can connect to both the
+ lower and the upper paths regardless what layer path one binds to.
+
20120211:
The getifaddrs upgrade path broken with 20111215 has been restored.
If you have upgraded in between 20111215 and 20120209 you need to
@@ -1557,4 +1565,4 @@
Contact Warner Losh if you have any questions about your use of
this document.
-$FreeBSD: src/UPDATING,v 1.713 2012/02/11 06:05:40 bz Exp $
+$FreeBSD: src/UPDATING,v 1.714 2012/02/29 21:38:31 trociny Exp $
==== //depot/projects/dtrace-mips/cddl/contrib/opensolaris/cmd/zfs/zfs.8#2 (text+ko) ====
@@ -22,9 +22,9 @@
.\" Copyright (c) 2012 Nexenta Systems, Inc. All Rights Reserved.
.\" Copyright (c) 2011, Pawel Jakub Dawidek <pjd at FreeBSD.org>
.\"
-.\" $FreeBSD: src/cddl/contrib/opensolaris/cmd/zfs/zfs.8,v 1.23 2012/02/23 19:13:19 mm Exp $
+.\" $FreeBSD: src/cddl/contrib/opensolaris/cmd/zfs/zfs.8,v 1.24 2012/02/26 16:30:39 mm Exp $
.\"
-.Dd November 26, 2011
+.Dd February 26, 2012
.Dt ZFS 8
.Os
.Sh NAME
@@ -413,9 +413,15 @@
same dataset to another jails. To allow management of the dataset from within
a jail, the
.Sy jailed
-property has to be set. The
+property has to be set and the jail needs access to the
+.Pa /dev/zfs
+device. The
.Sy quota
-property cannot be changed from within a jail.
+property cannot be changed from within a jail. See
+.Xr jail 8
+for information on how to allow mounting
+.Tn ZFS
+datasets from within a jail.
.Pp
.No A Tn ZFS
dataset can be detached from a jail using the
@@ -2715,13 +2721,12 @@
From now on this file system tree can be managed from within a jail if the
.Sy jailed
property has been set. To use this functionality, the jail needs the
+.Va allow.mount
+and
+.Va allow.mount.zfs
+parameters set to 1 and the
.Va enforce_statfs
-parameter set to
-.Sy 0
-and the
-.Va allow.mount
-parameter set to
-.Sy 1 .
+parameter set to a value lower than 2.
.Pp
See
.Xr jail 8
==== //depot/projects/dtrace-mips/contrib/top/top.c#2 (text+ko) ====
@@ -13,7 +13,7 @@
* Copyright (c) 1994, 1995, William LeFebvre, Argonne National Laboratory
* Copyright (c) 1996, William LeFebvre, Group sys Consulting
*
- * $FreeBSD: src/contrib/top/top.c,v 1.31 2011/07/18 21:15:47 jhb Exp $
+ * $FreeBSD: src/contrib/top/top.c,v 1.32 2012/02/27 20:52:20 kib Exp $
*/
/*
@@ -70,7 +70,6 @@
/* signal handling routines */
sigret_t leave();
-sigret_t onalrm();
sigret_t tstop();
#ifdef SIGWINCH
sigret_t winch();
@@ -723,12 +722,7 @@
no_command = Yes;
if (!interactive)
{
- /* set up alarm */
- (void) signal(SIGALRM, onalrm);
- (void) alarm((unsigned)delay);
-
- /* wait for the rest of it .... */
- pause();
+ sleep(delay);
}
else while (no_command)
{
@@ -1174,11 +1168,3 @@
exit(status);
/*NOTREACHED*/
}
-
-sigret_t onalrm() /* SIGALRM handler */
-
-{
- /* this is only used in batch mode to break out of the pause() */
- /* return; */
-}
-
==== //depot/projects/dtrace-mips/etc/devd/apple.conf#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/etc/devd/apple.conf,v 1.4 2012/01/28 02:52:22 jhibbits Exp $
+# $FreeBSD: src/etc/devd/apple.conf,v 1.5 2012/02/26 13:45:25 jhibbits Exp $
#
# PowerPC Apple specific devd events
@@ -19,6 +19,26 @@
};
+# The next blocks enable brightness hotkeys that can be found on Apple laptops
+notify 0 {
+ match "system" "PMU";
+ match "subsystem" "keys";
+ match "type" "brightness";
+ match "notify" "down";
+ action "sysctl dev.backlight.0.level=\
+ $(expr `sysctl -n dev.backlight.0.level` - 10)";
+};
+
+notify 0 {
+ match "system" "PMU";
+ match "subsystem" "keys";
+ match "type" "brightness";
+ match "notify" "up";
+ action "sysctl dev.backlight.0.level=\
+ $(expr `sysctl -n dev.backlight.0.level` + 10)";
+};
+
+
# The next blocks enable volume hotkeys that can be found on Apple laptops
notify 0 {
match "system" "PMU";
==== //depot/projects/dtrace-mips/gnu/usr.bin/cc/c++/Makefile#2 (text+ko) ====
@@ -1,14 +1,18 @@
-# $FreeBSD: src/gnu/usr.bin/cc/c++/Makefile,v 1.24 2007/05/19 04:25:56 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/c++/Makefile,v 1.25 2012/02/29 22:58:51 dim Exp $
+
+.include <bsd.own.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
.PATH: ${GCCDIR}/cp
-PROG= c++
+PROG= g++
SRCS+= g++spec.c
-LINKS= ${BINDIR}/c++ ${BINDIR}/g++
-LINKS+= ${BINDIR}/c++ ${BINDIR}/CC
+.if ${MK_CLANG_IS_CC} == "no"
+LINKS= ${BINDIR}/g++ ${BINDIR}/c++
+LINKS+= ${BINDIR}/g++ ${BINDIR}/CC
+.endif
NO_MAN=
DPADD= ${LIBCPP} ${LIBIBERTY}
==== //depot/projects/dtrace-mips/gnu/usr.bin/cc/cc/Makefile#2 (text+ko) ====
@@ -1,15 +1,20 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.33 2007/05/19 04:25:57 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cc/Makefile,v 1.34 2012/02/29 22:58:51 dim Exp $
+
+.include <bsd.own.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
-PROG= cc
+PROG= gcc
MAN= gcc.1
SRCS+= gccspec.c
NO_SHARED?=yes
-LINKS= ${BINDIR}/cc ${BINDIR}/gcc
-MLINKS= gcc.1 cc.1 gcc.1 c++.1 gcc.1 g++.1 gcc.1 CC.1
+MLINKS= gcc.1 g++.1
+.if ${MK_CLANG_IS_CC} == "no"
+LINKS= ${BINDIR}/gcc ${BINDIR}/cc
+MLINKS+= gcc.1 cc.1 gcc.1 c++.1 gcc.1 CC.1
+.endif
.include <bsd.prog.mk>
==== //depot/projects/dtrace-mips/gnu/usr.bin/cc/cpp/Makefile#2 (text+ko) ====
@@ -1,10 +1,16 @@
-# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.27 2007/05/19 04:25:58 kan Exp $
+# $FreeBSD: src/gnu/usr.bin/cc/cpp/Makefile,v 1.28 2012/02/29 22:58:51 dim Exp $
+.include <bsd.own.mk>
.include "../Makefile.inc"
.include "../Makefile.fe"
-PROG= cpp
+PROG= gcpp
SRCS+= cppspec.c
+.if ${MK_CLANG_IS_CC} == "no"
+LINKS= ${BINDIR}/gcpp ${BINDIR}/cpp
+MLINKS= gcpp.1 cpp.1
+.endif
+
.include <bsd.prog.mk>
==== //depot/projects/dtrace-mips/lib/libc/sys/getsockopt.2#2 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" @(#)getsockopt.2 8.4 (Berkeley) 5/2/95
-.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.43 2011/11/21 14:36:19 pluknet Exp $
+.\" $FreeBSD: src/lib/libc/sys/getsockopt.2,v 1.44 2012/02/26 13:57:24 kib Exp $
.\"
-.Dd November 21, 2011
+.Dd February 26, 2012
.Dt GETSOCKOPT 2
.Os
.Sh NAME
@@ -172,6 +172,8 @@
.It Dv SO_BINTIME Ta "enables reception of a timestamp with datagrams"
.It Dv SO_ACCEPTCONN Ta "get listening status of the socket (get only)"
.It Dv SO_TYPE Ta "get the type of the socket (get only)"
+.It Dv SO_PROTOCOL Ta "get the protocol number for the socket (get only)"
+.It Dv SO_PROTOTYPE Ta "SunOS alias for the Linux SO_PROTOCOL (get only)"
.It Dv SO_ERROR Ta "get and clear error on the socket (get only)"
.It Dv SO_SETFIB Ta "set the associated FIB (routing table) for the socket (set only)"
.El
@@ -449,7 +451,10 @@
.Ed
.Pp
.Dv SO_ACCEPTCONN ,
-.Dv SO_TYPE
+.Dv SO_TYPE ,
+.Dv SO_PROTOCOL
+(and its alias
+.Dv SO_PROTOTYPE )
and
.Dv SO_ERROR
are options used only with
@@ -463,6 +468,12 @@
returns the type of the socket, such as
.Dv SOCK_STREAM ;
it is useful for servers that inherit sockets on startup.
+.Dv SO_PROTOCOL
+returns the protocol number for the socket, for
+.Dv AF_INET
+and
+.Dv AF_INET6
+address families.
.Dv SO_ERROR
returns any pending error on the socket and clears
the error status.
==== //depot/projects/dtrace-mips/lib/libsm/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libsm/Makefile,v 1.16 2011/12/16 17:02:25 dim Exp $
+# $FreeBSD: src/lib/libsm/Makefile,v 1.17 2012/02/28 18:30:18 dim Exp $
.include <bsd.own.mk>
@@ -18,12 +18,10 @@
WARNS?= 2
-.if ${CC:T:Mclang} == "clang"
# Unfortunately, clang gives warnings about sendmail code that cannot
# be turned off yet. Since this is contrib code, and we don't really
# care about the warnings, just make them non-fatal for now.
-NO_WERROR=
-.endif
+NO_WERROR.clang=
LIB= sm
==== //depot/projects/dtrace-mips/lib/libthr/thread/thr_rwlock.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.19 2010/10/20 02:34:02 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_rwlock.c,v 1.20 2012/02/27 13:38:52 davidxu Exp $
*/
#include <errno.h>
@@ -123,7 +123,6 @@
{
struct pthread *curthread = _get_curthread();
pthread_rwlock_t prwlock;
- struct timespec ts, ts2, *tsp;
int flags;
int ret;
@@ -162,18 +161,8 @@
return (EINVAL);
for (;;) {
- if (abstime) {
- clock_gettime(CLOCK_REALTIME, &ts);
- TIMESPEC_SUB(&ts2, abstime, &ts);
- if (ts2.tv_sec < 0 ||
- (ts2.tv_sec == 0 && ts2.tv_nsec <= 0))
- return (ETIMEDOUT);
- tsp = &ts2;
- } else
- tsp = NULL;
-
/* goto kernel and lock it */
- ret = __thr_rwlock_rdlock(&prwlock->lock, flags, tsp);
+ ret = __thr_rwlock_rdlock(&prwlock->lock, flags, abstime);
if (ret != EINTR)
break;
@@ -255,7 +244,6 @@
{
struct pthread *curthread = _get_curthread();
pthread_rwlock_t prwlock;
- struct timespec ts, ts2, *tsp;
int ret;
CHECK_AND_INIT_RWLOCK
@@ -275,18 +263,8 @@
return (EINVAL);
for (;;) {
- if (abstime != NULL) {
- clock_gettime(CLOCK_REALTIME, &ts);
- TIMESPEC_SUB(&ts2, abstime, &ts);
- if (ts2.tv_sec < 0 ||
- (ts2.tv_sec == 0 && ts2.tv_nsec <= 0))
- return (ETIMEDOUT);
- tsp = &ts2;
- } else
- tsp = NULL;
-
/* goto kernel and lock it */
- ret = __thr_rwlock_wrlock(&prwlock->lock, tsp);
+ ret = __thr_rwlock_wrlock(&prwlock->lock, abstime);
if (ret == 0) {
prwlock->owner = curthread;
break;
==== //depot/projects/dtrace-mips/lib/libthr/thread/thr_umtx.c#2 (text+ko) ====
@@ -23,7 +23,7 @@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_umtx.c,v 1.25 2012/02/25 02:12:17 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_umtx.c,v 1.26 2012/02/27 13:38:52 davidxu Exp $
*
*/
@@ -265,15 +265,42 @@
}
int
-__thr_rwlock_rdlock(struct urwlock *rwlock, int flags, struct timespec *tsp)
+__thr_rwlock_rdlock(struct urwlock *rwlock, int flags,
+ const struct timespec *tsp)
{
- return _umtx_op_err(rwlock, UMTX_OP_RW_RDLOCK, flags, NULL, tsp);
+ struct _umtx_time timeout, *tm_p;
+ size_t tm_size;
+
+ if (tsp == NULL) {
+ tm_p = NULL;
+ tm_size = 0;
+ } else {
+ timeout._timeout = *tsp;
+ timeout._flags = UMTX_ABSTIME;
+ timeout._clockid = CLOCK_REALTIME;
+ tm_p = &timeout;
+ tm_size = sizeof(timeout);
+ }
+ return _umtx_op_err(rwlock, UMTX_OP_RW_RDLOCK, flags, (void *)tm_size, tm_p);
}
int
-__thr_rwlock_wrlock(struct urwlock *rwlock, struct timespec *tsp)
+__thr_rwlock_wrlock(struct urwlock *rwlock, const struct timespec *tsp)
{
- return _umtx_op_err(rwlock, UMTX_OP_RW_WRLOCK, 0, NULL, tsp);
+ struct _umtx_time timeout, *tm_p;
+ size_t tm_size;
+
+ if (tsp == NULL) {
+ tm_p = NULL;
+ tm_size = 0;
+ } else {
+ timeout._timeout = *tsp;
+ timeout._flags = UMTX_ABSTIME;
+ timeout._clockid = CLOCK_REALTIME;
+ tm_p = &timeout;
+ tm_size = sizeof(timeout);
+ }
+ return _umtx_op_err(rwlock, UMTX_OP_RW_WRLOCK, 0, (void *)tm_size, tm_p);
}
int
==== //depot/projects/dtrace-mips/lib/libthr/thread/thr_umtx.h#2 (text+ko) ====
@@ -23,7 +23,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
*
- * $FreeBSD: src/lib/libthr/thread/thr_umtx.h,v 1.18 2010/12/22 05:01:52 davidxu Exp $
+ * $FreeBSD: src/lib/libthr/thread/thr_umtx.h,v 1.19 2012/02/27 13:38:52 davidxu Exp $
*/
#ifndef _THR_FBSD_UMTX_H_
@@ -60,8 +60,10 @@
int _thr_ucond_signal(struct ucond *cv) __hidden;
int _thr_ucond_broadcast(struct ucond *cv) __hidden;
-int __thr_rwlock_rdlock(struct urwlock *rwlock, int flags, struct timespec *tsp) __hidden;
-int __thr_rwlock_wrlock(struct urwlock *rwlock, struct timespec *tsp) __hidden;
+int __thr_rwlock_rdlock(struct urwlock *rwlock, int flags,
+ const struct timespec *tsp) __hidden;
+int __thr_rwlock_wrlock(struct urwlock *rwlock,
+ const struct timespec *tsp) __hidden;
int __thr_rwlock_unlock(struct urwlock *rwlock) __hidden;
/* Internal used only */
==== //depot/projects/dtrace-mips/lib/libthread_db/Makefile#2 (text+ko) ====
@@ -1,4 +1,4 @@
-# $FreeBSD: src/lib/libthread_db/Makefile,v 1.18 2011/12/16 15:00:56 dim Exp $
+# $FreeBSD: src/lib/libthread_db/Makefile,v 1.19 2012/02/28 18:30:18 dim Exp $
.PATH: ${.CURDIR}/arch/${MACHINE_CPUARCH}
@@ -16,10 +16,8 @@
SYMBOL_MAPS=${SYM_MAPS}
VERSION_DEF=${.CURDIR}/../libc/Versions.def
-.if ${CC:T:Mclang} == "clang"
# Unfortunately, clang gives an incorrect warning about alignment in
# arch/i386/libpthread_md.c, so turn that off for now.
-NO_WCAST_ALIGN=
-.endif
+NO_WCAST_ALIGN.clang=
.include <bsd.lib.mk>
==== //depot/projects/dtrace-mips/lib/libz/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
#
-# $FreeBSD: src/lib/libz/Makefile,v 1.22 2011/07/18 19:23:50 delphij Exp $
+# $FreeBSD: src/lib/libz/Makefile,v 1.23 2012/02/28 18:30:18 dim Exp $
#
LIB= z
@@ -47,11 +47,7 @@
#SRCS+= gvmat64.S
#CFLAGS+= -DASMV -DNO_UNDERLINE
#ACFLAGS+= -Wa,--noexecstack
-#.if ${CC:T:Mclang} == "clang"
-## XXX: clang integrated-as doesn't grok .intel_syntax directives yet
-#ACFLAGS+= ${.IMPSRC:T:Mgvmat64.S:C/^.+$/-no-integrated-as/}
#.endif
-#.endif
VERSION_DEF= ${.CURDIR}/Versions.def
SYMBOL_MAPS= ${.CURDIR}/Symbol.map
@@ -71,3 +67,7 @@
echo hello world | ./minigzip | ./minigzip -d )
.include <bsd.lib.mk>
+
+## XXX: clang integrated-as doesn't grok .intel_syntax directives yet
+#ACFLAGS.gvmat64.S= ${CLANG_NO_IAS}
+#ACFLAGS+= ${ACFLAGS.${.IMPSRC:T}}
==== //depot/projects/dtrace-mips/libexec/mail.local/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 7/19/93
-# $FreeBSD: src/libexec/mail.local/Makefile,v 1.24 2011/12/16 17:02:25 dim Exp $
+# $FreeBSD: src/libexec/mail.local/Makefile,v 1.25 2012/02/28 18:30:18 dim Exp $
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/mail.local
@@ -12,12 +12,10 @@
WARNS?= 2
WFORMAT=0
-.if ${CC:T:Mclang} == "clang"
# Unfortunately, clang gives warnings about sendmail code that cannot
# be turned off yet. Since this is contrib code, and we don't really
# care about the warnings, just make them non-fatal for now.
-NO_WERROR=
-.endif
+NO_WERROR.clang=
LIBSMDIR= ${.OBJDIR}/../../lib/libsm
LIBSM= ${LIBSMDIR}/libsm.a
==== //depot/projects/dtrace-mips/libexec/smrsh/Makefile#2 (text+ko) ====
@@ -1,5 +1,5 @@
# @(#)Makefile 8.1 (Berkeley) 7/2/95
-# $FreeBSD: src/libexec/smrsh/Makefile,v 1.13 2011/12/16 17:02:25 dim Exp $
+# $FreeBSD: src/libexec/smrsh/Makefile,v 1.14 2012/02/28 18:30:18 dim Exp $
SENDMAIL_DIR=${.CURDIR}/../../contrib/sendmail
.PATH: ${SENDMAIL_DIR}/smrsh
@@ -17,12 +17,10 @@
WARNS?= 2
-.if ${CC:T:Mclang} == "clang"
# Unfortunately, clang gives warnings about sendmail code that cannot
# be turned off yet. Since this is contrib code, and we don't really
# care about the warnings, just make them non-fatal for now.
-NO_WERROR=
-.endif
+NO_WERROR.clang=
SRCS+= sm_os.h
CLEANFILES+=sm_os.h
==== //depot/projects/dtrace-mips/sbin/fsdb/Makefile#2 (text+ko) ====
@@ -1,6 +1,6 @@
# $NetBSD: Makefile,v 1.1.1.1 1995/10/08 23:08:36 thorpej Exp $
# @(#)Makefile 8.1 (Berkeley) 6/5/93
-# $FreeBSD: src/sbin/fsdb/Makefile,v 1.20 2011/12/18 17:42:26 dim Exp $
+# $FreeBSD: src/sbin/fsdb/Makefile,v 1.21 2012/02/28 18:30:18 dim Exp $
PROG= fsdb
MAN= fsdb.8
@@ -9,10 +9,8 @@
pass5.c setup.c utilities.c ffs_subr.c ffs_tables.c
CFLAGS+= -I${.CURDIR}/../fsck_ffs
WARNS?= 2
-.if ${CC:T:Mclang} == "clang"
# Work around a problem with format string warnings and ntohs macros.
-NO_WFORMAT=
-.endif
+NO_WFORMAT.clang=
LDADD= -ledit -ltermcap
DPADD= ${LIBEDIT} ${LIBTERMCAP}
.PATH: ${.CURDIR}/../fsck_ffs ${.CURDIR}/../../sys/ufs/ffs
==== //depot/projects/dtrace-mips/sbin/ifconfig/ifconfig.8#2 (text+ko) ====
@@ -26,9 +26,9 @@
.\" SUCH DAMAGE.
.\"
.\" From: @(#)ifconfig.8 8.3 (Berkeley) 1/5/94
-.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.185 2012/01/04 21:04:57 rwatson Exp $
+.\" $FreeBSD: src/sbin/ifconfig/ifconfig.8,v 1.187 2012/02/29 21:11:02 brueffer Exp $
.\"
-.Dd January 4, 2012
+.Dd February 29, 2012
.Dt IFCONFIG 8
.Os
.Sh NAME
@@ -1036,7 +1036,7 @@
DFS embodies several facilities including detection of overlapping
radar signals, dynamic transmit power control, and channel selection
according to a least-congested criteria.
-DFS support is mandatory for some 5Ghz frequencies in certain
+DFS support is mandatory for some 5GHz frequencies in certain
locales (e.g. ETSI).
By default DFS is enabled according to the regulatory definitions
specified in /etc/regdomain.xml and the current country code, regdomain,
@@ -1091,7 +1091,7 @@
.It Cm quiet
Enable the use of quiet IE. Hostap will use this to silent other
stations to reduce interference for radar detection when
-operating on 5Ghz frequency and doth support is enabled.
+operating on 5GHz frequency and doth support is enabled.
Use
.Fl quiet
to disable this functionality.
@@ -2106,7 +2106,7 @@
.It Cm maxaddr Ar size
Set the size of the bridge address cache to
.Ar size .
-The default is 100 entries.
+The default is 2000 entries.
.It Cm timeout Ar seconds
Set the timeout of address cache entries to
.Ar seconds
@@ -2114,7 +2114,7 @@
If
.Ar seconds
is zero, then address cache entries will not be expired.
-The default is 240 seconds.
+The default is 1200 seconds.
.It Cm addr
Display the addresses that have been learned by the bridge.
.It Cm static Ar interface-name Ar address
==== //depot/projects/dtrace-mips/sbin/ipfw/ipfw.8#2 (text+ko) ====
@@ -1,5 +1,5 @@
.\"
-.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.252 2012/02/06 11:51:04 glebius Exp $
+.\" $FreeBSD: src/sbin/ipfw/ipfw.8,v 1.253 2012/02/28 13:19:34 gavin Exp $
.\"
.Dd February 6, 2012
.Dt IPFW 8
@@ -2235,7 +2235,7 @@
is just a FIFO scheduler (which means that all packets
are stored in the same queue as they arrive to the scheduler).
FIFO has O(1) per-packet time complexity, with very low
-constants (estimate 60-80ns on a 2Ghz desktop machine)
+constants (estimate 60-80ns on a 2GHz desktop machine)
but gives no service guarantees.
.It Cm wf2qp
implements the WF2Q+ algorithm, which is a Weighted Fair Queueing
==== //depot/projects/dtrace-mips/share/man/man4/ath.4#2 (text+ko) ====
@@ -26,7 +26,7 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF
.\" THE POSSIBILITY OF SUCH DAMAGES.
.\"
-.\" $FreeBSD: src/share/man/man4/ath.4,v 1.55 2011/08/28 10:10:31 brueffer Exp $
+.\" $FreeBSD: src/share/man/man4/ath.4,v 1.56 2012/02/28 13:19:34 gavin Exp $
.\"/
.Dd August 28, 2011
.Dt ATH 4
@@ -95,8 +95,8 @@
AR5416-class devices are capable of 802.11n operation
but are supported only in legacy modes (802.11a, 11b, 11g).
Most chips also support an Atheros Turbo Mode (TM) that operates in
-the 5Ghz frequency range with 2x the transmit speeds.
-Some chips also support Turbo mode in the 2.4Ghz range with 802.11g
+the 5GHz frequency range with 2x the transmit speeds.
+Some chips also support Turbo mode in the 2.4GHz range with 802.11g
though this support is not presently available due to regulatory requirements.
(Note that Turbo modes are, however,
only interoperable with other Atheros-based devices.)
==== //depot/projects/dtrace-mips/share/man/man4/mos.4#2 (text+ko) ====
@@ -13,14 +13,14 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.\" $FreeBSD: src/share/man/man4/mos.4,v 1.2 2011/02/17 07:39:53 hselasky Exp $
+.\" $FreeBSD: src/share/man/man4/mos.4,v 1.3 2012/02/28 15:45:42 kevlo Exp $
.\"
.Dd February 14, 2011
.Dt MOS 4
.Os
.Sh NAME
.Nm mos
-.Nd Moschip MCS7730/MCS7840 USB Ethernet driver
+.Nd Moschip MCS7730/MCS7830/MCS7832 USB Ethernet driver
.Sh SYNOPSIS
To compile this driver into the kernel,
>>> TRUNCATED FOR MAIL (1000 lines) <<<
More information about the p4-projects
mailing list