PERFORCE change 150133 for review

Ed Schouten ed at FreeBSD.org
Fri Sep 19 18:36:30 UTC 2008


http://perforce.freebsd.org/chv.cgi?CH=150133

Change 150133 by ed at ed_dull on 2008/09/19 18:35:59

	IFC.

Affected files ...

.. //depot/projects/mpsafetty/Makefile.inc1#4 integrate
.. //depot/projects/mpsafetty/ObsoleteFiles.inc#12 integrate
.. //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 integrate
.. //depot/projects/mpsafetty/gnu/lib/libgcc/Makefile#3 integrate
.. //depot/projects/mpsafetty/gnu/lib/libgomp/Makefile#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive.h#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_entry.h#3 integrate
.. //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_mtree.c#2 integrate
.. //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_mtree.c#3 integrate
.. //depot/projects/mpsafetty/lib/libc/uuid/Symbol.map#3 integrate
.. //depot/projects/mpsafetty/lib/libpmc/pmc.3#3 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/Makefile#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/errata/Makefile#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/errata/article.sgml#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/hardware/Makefile#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/hardware/article.sgml#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/readme/Makefile#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/readme/article.sgml#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/relnotes/Makefile#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/share/sgml/catalog#2 integrate
.. //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/share/sgml/release.dsl#2 integrate
.. //depot/projects/mpsafetty/sbin/bsdlabel/bsdlabel.c#2 integrate
.. //depot/projects/mpsafetty/sbin/mount_nfs/mount_nfs.c#4 integrate
.. //depot/projects/mpsafetty/share/man/man4/age.4#2 integrate
.. //depot/projects/mpsafetty/share/man/man4/snd_hda.4#4 integrate
.. //depot/projects/mpsafetty/share/man/man5/rc.conf.5#5 integrate
.. //depot/projects/mpsafetty/share/man/man9/Makefile#7 integrate
.. //depot/projects/mpsafetty/share/man/man9/priv.9#2 integrate
.. //depot/projects/mpsafetty/share/man/man9/suser.9#2 delete
.. //depot/projects/mpsafetty/share/man/man9/ucred.9#2 integrate
.. //depot/projects/mpsafetty/share/man/man9/vfs_suser.9#2 integrate
.. //depot/projects/mpsafetty/share/misc/committers-src.dot#5 integrate
.. //depot/projects/mpsafetty/sys/amd64/amd64/identcpu.c#2 integrate
.. //depot/projects/mpsafetty/sys/boot/Makefile#3 integrate
.. //depot/projects/mpsafetty/sys/boot/ofw/libofw/Makefile#2 integrate
.. //depot/projects/mpsafetty/sys/boot/ofw/libofw/ofw_console.c#2 integrate
.. //depot/projects/mpsafetty/sys/cam/cam.h#2 integrate
.. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/kern/opensolaris_atomic.c#2 integrate
.. //depot/projects/mpsafetty/sys/cddl/compat/opensolaris/sys/atomic.h#2 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_misc.c#4 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_proto.h#6 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscall.h#6 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_syscalls.c#6 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/freebsd32_sysent.c#6 integrate
.. //depot/projects/mpsafetty/sys/compat/freebsd32/syscalls.master#7 integrate
.. //depot/projects/mpsafetty/sys/conf/ldscript.mips#2 integrate
.. //depot/projects/mpsafetty/sys/conf/options.mips#2 integrate
.. //depot/projects/mpsafetty/sys/dev/acpica/acpi_quirk.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/ata/ata-chipset.c#6 integrate
.. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.c#2 integrate
.. //depot/projects/mpsafetty/sys/dev/ata/ata-pci.h#5 integrate
.. //depot/projects/mpsafetty/sys/dev/cxgb/ulp/tom/cxgb_cpl_io.c#7 integrate
.. //depot/projects/mpsafetty/sys/dev/snp/snp.c#14 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/if_zyd.c#4 integrate
.. //depot/projects/mpsafetty/sys/dev/usb/usbdevs#11 integrate
.. //depot/projects/mpsafetty/sys/geom/geom_io.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/identcpu.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/intr_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/i386/pmap.c#5 integrate
.. //depot/projects/mpsafetty/sys/i386/include/specialreg.h#3 integrate
.. //depot/projects/mpsafetty/sys/i386/xen/mp_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/i386/xen/xen_machdep.c#8 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_priv.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/kern_syscalls.c#2 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_cache.c#5 integrate
.. //depot/projects/mpsafetty/sys/kern/vfs_mount.c#9 integrate
.. //depot/projects/mpsafetty/sys/mips/adm5120/obio.c#3 integrate
.. //depot/projects/mpsafetty/sys/mips/conf/IDT#3 integrate
.. //depot/projects/mpsafetty/sys/mips/idt/obio.c#3 integrate
.. //depot/projects/mpsafetty/sys/mips/malta/gt_pci.c#3 integrate
.. //depot/projects/mpsafetty/sys/mips/mips/intr_machdep.c#3 integrate
.. //depot/projects/mpsafetty/sys/net/if_lagg.c#2 integrate
.. //depot/projects/mpsafetty/sys/netipx/ipx.c#2 integrate
.. //depot/projects/mpsafetty/sys/nfsserver/nfs_serv.c#4 integrate
.. //depot/projects/mpsafetty/sys/powerpc/ofw/ofw_syscons.c#2 integrate
.. //depot/projects/mpsafetty/sys/security/mac_bsdextended/mac_bsdextended.c#6 integrate
.. //depot/projects/mpsafetty/sys/sparc64/include/smp.h#3 integrate
.. //depot/projects/mpsafetty/sys/sparc64/pci/psycho.c#4 integrate
.. //depot/projects/mpsafetty/sys/sparc64/pci/psychoreg.h#2 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/genassym.c#6 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/intr_machdep.c#2 integrate
.. //depot/projects/mpsafetty/sys/sparc64/sparc64/mp_machdep.c#6 integrate
.. //depot/projects/mpsafetty/sys/sys/mount.h#4 integrate
.. //depot/projects/mpsafetty/sys/sys/param.h#12 integrate
.. //depot/projects/mpsafetty/sys/sys/priv.h#3 integrate
.. //depot/projects/mpsafetty/sys/sys/sysent.h#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/pmcstat/pmcstat.8#2 integrate
.. //depot/projects/mpsafetty/usr.sbin/pmcstat/pmcstat.c#2 integrate

Differences ...

==== //depot/projects/mpsafetty/Makefile.inc1#4 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/Makefile.inc1,v 1.610 2008/08/19 14:23:26 jhb Exp $
+# $FreeBSD: src/Makefile.inc1,v 1.611 2008/09/19 16:14:42 obrien Exp $
 #
 # Make command line options:
 #	-DNO_CLEANDIR run ${MAKE} clean, instead of ${MAKE} cleandir
@@ -27,6 +27,10 @@
 
 .include <bsd.own.mk>
 
+.if ${MACHINE_ARCH} == "mips"
+MK_RESCUE=no	# not yet
+.endif
+
 # We must do share/info early so that installation of info `dir'
 # entries works correctly.  Do it first since it is less likely to
 # grow dependencies on include and lib than vice versa.

==== //depot/projects/mpsafetty/ObsoleteFiles.inc#12 (text+ko) ====

@@ -1,5 +1,5 @@
 #
-# $FreeBSD: src/ObsoleteFiles.inc,v 1.160 2008/09/14 17:49:46 antoine Exp $
+# $FreeBSD: src/ObsoleteFiles.inc,v 1.161 2008/09/17 15:49:44 attilio Exp $
 #
 # This file lists old files (OLD_FILES), libraries (OLD_LIBS) and
 # directories (OLD_DIRS) which should get removed at an update. Recently
@@ -14,6 +14,8 @@
 # The file is partitioned: OLD_FILES first, then OLD_LIBS and OLD_DIRS last.
 #
 
+# 20080917: removal of manpage for axed kernel primitive suser(9)
+OLD_FILES+=usr/share/man/man9/suser.9
 # 20080913: pax removed from rescue
 OLD_FILES+=rescue/pax
 # 20080823: removal of unneeded pt_chown, to implement grantpt(3)

==== //depot/projects/mpsafetty/cddl/contrib/opensolaris/lib/libdtrace/common/dt_printf.c#2 (text+ko) ====

@@ -306,7 +306,7 @@
 	case sizeof (double):
 		return (dt_printf(dtp, fp, format,
 		    *((double *)addr) / n));
-#if !defined(__arm__) && !defined(__powerpc__)
+#if !defined(__arm__) && !defined(__powerpc__) && !defined(__mips__)
 	case sizeof (long double):
 		return (dt_printf(dtp, fp, format,
 		    *((long double *)addr) / ldn));

==== //depot/projects/mpsafetty/gnu/lib/libgcc/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.60 2008/09/01 18:46:03 obrien Exp $
+# $FreeBSD: src/gnu/lib/libgcc/Makefile,v 1.62 2008/09/19 03:09:36 imp Exp $
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
 
@@ -173,8 +173,8 @@
 #
 # Floating point emulation functions
 #
-.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "powerpc" || \
-    ${TARGET_ARCH} == "sparc64" || ${TARGET_ARCH} == "mips"
+.if ${TARGET_ARCH} == "armNOT_YET" || ${TARGET_ARCH} == "mips" || \
+    ${TARGET_ARCH} == "powerpc" || ${TARGET_ARCH} == "sparc64"
 
 FPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES -DFLOAT
 DPBIT_CFLAGS =	-DFINE_GRAINED_LIBRARIES

==== //depot/projects/mpsafetty/gnu/lib/libgomp/Makefile#3 (text+ko) ====

@@ -1,4 +1,4 @@
-# $FreeBSD: src/gnu/lib/libgomp/Makefile,v 1.3 2008/09/01 18:46:03 obrien Exp $
+# $FreeBSD: src/gnu/lib/libgomp/Makefile,v 1.4 2008/09/19 02:30:22 imp Exp $
 
 GCCDIR=	${.CURDIR}/../../../contrib/gcc
 GCCLIB=	${.CURDIR}/../../../contrib/gcclibs
@@ -24,7 +24,7 @@
 
 # Target-specific OpenMP configuration
 .if ${MACHINE_ARCH} == arm || ${MACHINE_ARCH} == i386 || \
-    ${MACHINE_ARCH} == powerpc || ${MACHINE_ARCH} == mips
+    ${MACHINE_ARCH} == mips || ${MACHINE_ARCH} == powerpc
 OMP_LOCK_ALIGN	=	4
 OMP_LOCK_KIND=		4
 OMP_LOCK_SIZE=		4

==== //depot/projects/mpsafetty/lib/libarchive/archive.h#3 (text+ko) ====

@@ -22,7 +22,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/libarchive/archive.h,v 1.19 2008/08/31 07:21:46 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive.h,v 1.21 2008/09/18 04:19:06 kientzle Exp $
  */
 
 #ifndef ARCHIVE_H_INCLUDED
@@ -46,11 +46,13 @@
 /* Get appropriate definitions of standard POSIX-style types. */
 /* These should match the types used in 'struct stat' */
 #ifdef _WIN32
+#define	__LA_INT64_T	__int64
 #define	__LA_SSIZE_T	long
 #define	__LA_UID_T	unsigned int
 #define	__LA_GID_T	unsigned int
 #else
 #include <unistd.h>  /* ssize_t, uid_t, and gid_t */
+#define	__LA_INT64_T	int64_t
 #define	__LA_SSIZE_T	ssize_t
 #define	__LA_UID_T	uid_t
 #define	__LA_GID_T	gid_t
@@ -247,8 +249,6 @@
 #define	ARCHIVE_FORMAT_AR_GNU			(ARCHIVE_FORMAT_AR | 1)
 #define	ARCHIVE_FORMAT_AR_BSD			(ARCHIVE_FORMAT_AR | 2)
 #define	ARCHIVE_FORMAT_MTREE			0x80000
-#define	ARCHIVE_FORMAT_MTREE_V1			(ARCHIVE_FORMAT_MTREE | 1)
-#define	ARCHIVE_FORMAT_MTREE_V2			(ARCHIVE_FORMAT_MTREE | 2)
 
 /*-
  * Basic outline for reading an archive:
@@ -330,7 +330,7 @@
  * Retrieve the byte offset in UNCOMPRESSED data where last-read
  * header started.
  */
-__LA_DECL int64_t		 archive_read_header_position(struct archive *);
+__LA_DECL __LA_INT64_T		 archive_read_header_position(struct archive *);
 
 /* Read data from the body of an entry.  Similar to read(2). */
 __LA_DECL __LA_SSIZE_T		 archive_read_data(struct archive *, void *, size_t);
@@ -567,9 +567,9 @@
  * the struct archive object:
  */
 /* Bytes written after compression or read before decompression. */
-__LA_DECL int64_t	 archive_position_compressed(struct archive *);
+__LA_DECL __LA_INT64_T	 archive_position_compressed(struct archive *);
 /* Bytes written to compressor or read from decompressor. */
-__LA_DECL int64_t	 archive_position_uncompressed(struct archive *);
+__LA_DECL __LA_INT64_T	 archive_position_uncompressed(struct archive *);
 
 __LA_DECL const char	*archive_compression_name(struct archive *);
 __LA_DECL int		 archive_compression(struct archive *);

==== //depot/projects/mpsafetty/lib/libarchive/archive_entry.h#3 (text+ko) ====

@@ -22,7 +22,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/libarchive/archive_entry.h,v 1.28 2008/09/01 04:54:29 kientzle Exp $
+ * $FreeBSD: src/lib/libarchive/archive_entry.h,v 1.29 2008/09/18 04:19:06 kientzle Exp $
  */
 
 #ifndef ARCHIVE_ENTRY_H_INCLUDED
@@ -43,12 +43,14 @@
 /* Get appropriate definitions of standard POSIX-style types. */
 /* These should match the types used in 'struct stat' */
 #ifdef _WIN32
+#define	__LA_INT64_T	__int64
 #define	__LA_UID_T	unsigned int
 #define	__LA_GID_T	unsigned int
 #define	__LA_DEV_T	unsigned int
 #define	__LA_MODE_T	unsigned short
 #else
 #include <unistd.h>
+#define	__LA_INT64_T	int64_t
 #define	__LA_UID_T	uid_t
 #define	__LA_GID_T	gid_t
 #define	__LA_DEV_T	dev_t
@@ -200,7 +202,7 @@
 __LA_DECL dev_t		 archive_entry_rdevmajor(struct archive_entry *);
 __LA_DECL dev_t		 archive_entry_rdevminor(struct archive_entry *);
 __LA_DECL const char	*archive_entry_sourcepath(struct archive_entry *);
-__LA_DECL int64_t	 archive_entry_size(struct archive_entry *);
+__LA_DECL __LA_INT64_T	 archive_entry_size(struct archive_entry *);
 __LA_DECL int		 archive_entry_size_is_set(struct archive_entry *);
 __LA_DECL const char	*archive_entry_strmode(struct archive_entry *);
 __LA_DECL const char	*archive_entry_symlink(struct archive_entry *);
@@ -261,7 +263,7 @@
 __LA_DECL void	archive_entry_set_rdev(struct archive_entry *, dev_t);
 __LA_DECL void	archive_entry_set_rdevmajor(struct archive_entry *, dev_t);
 __LA_DECL void	archive_entry_set_rdevminor(struct archive_entry *, dev_t);
-__LA_DECL void	archive_entry_set_size(struct archive_entry *, int64_t);
+__LA_DECL void	archive_entry_set_size(struct archive_entry *, __LA_INT64_T);
 __LA_DECL void	archive_entry_unset_size(struct archive_entry *);
 __LA_DECL void	archive_entry_copy_sourcepath(struct archive_entry *, const char *);
 __LA_DECL void	archive_entry_set_symlink(struct archive_entry *, const char *);

==== //depot/projects/mpsafetty/lib/libarchive/archive_read_support_format_mtree.c#2 (text+ko) ====

@@ -25,7 +25,7 @@
  */
 
 #include "archive_platform.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.9 2008/06/21 19:06:37 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/archive_read_support_format_mtree.c,v 1.10 2008/09/18 04:13:36 kientzle Exp $");
 
 #ifdef HAVE_SYS_STAT_H
 #include <sys/stat.h>
@@ -408,7 +408,7 @@
 	struct mtree_entry *last_entry;
 	int r;
 
-	mtree->archive_format = ARCHIVE_FORMAT_MTREE_V1;
+	mtree->archive_format = ARCHIVE_FORMAT_MTREE;
 	mtree->archive_format_name = "mtree";
 
 	global = NULL;

==== //depot/projects/mpsafetty/lib/libarchive/test/test_read_format_mtree.c#3 (text+ko) ====

@@ -23,7 +23,7 @@
  * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 #include "test.h"
-__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_mtree.c,v 1.3 2008/09/01 05:38:33 kientzle Exp $");
+__FBSDID("$FreeBSD: src/lib/libarchive/test/test_read_format_mtree.c,v 1.4 2008/09/18 04:13:36 kientzle Exp $");
 
 /* Single entry with a hardlink. */
 static unsigned char archive[] = {
@@ -60,7 +60,7 @@
 	assertEqualIntA(a, ARCHIVE_OK,
 	    archive_read_open_memory(a, archive, sizeof(archive)));
 	assertEqualIntA(a, ARCHIVE_OK, archive_read_next_header(a, &ae));
-	assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE_V1);
+	assertEqualInt(archive_format(a), ARCHIVE_FORMAT_MTREE);
 	assertEqualString(archive_entry_pathname(ae), "file");
 	assertEqualInt(archive_entry_uid(ae), 18);
 	assert(S_ISREG(archive_entry_mode(ae)));

==== //depot/projects/mpsafetty/lib/libc/uuid/Symbol.map#3 (text) ====

@@ -1,5 +1,5 @@
 /*
- * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.3 2008/09/15 23:54:55 emax Exp $
+ * $FreeBSD: src/lib/libc/uuid/Symbol.map,v 1.4 2008/09/19 15:52:56 emax Exp $
  */
 
 FBSD_1.0 {
@@ -11,6 +11,9 @@
 	uuid_create_nil;
 	uuid_create;
 	uuid_compare;
+};
+
+FBSD_1.1 {
 	uuid_enc_le;
 	uuid_dec_le;
 	uuid_enc_be;

==== //depot/projects/mpsafetty/lib/libpmc/pmc.3#3 (text+ko) ====

@@ -21,7 +21,7 @@
 .\" out of the use of this software, even if advised of the possibility of
 .\" such damage.
 .\"
-.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.18 2008/09/16 16:58:24 jkoshy Exp $
+.\" $FreeBSD: src/lib/libpmc/pmc.3,v 1.21 2008/09/19 13:21:23 jkoshy Exp $
 .\"
 .Dd September 16, 2008
 .Os
@@ -129,58 +129,89 @@
 .Vt "enum pmc_cputype"
 enumeration.
 Supported CPUs include:
-.Bl -tag -width PMC_CPU_INTEL_PIII -compact
-.It PMC_CPU_AMD_K7
+.Bl -tag -width "Li PMC_CPU_INTEL_CORE2" -compact
+.It Li PMC_CPU_AMD_K7
 .Tn "AMD Athlon"
 CPUs.
-.It PMC_CPU_AMD_K8
+.It Li PMC_CPU_AMD_K8
 .Tn "AMD Athlon64"
 CPUs.
-.It PMC_CPU_INTEL_P5
+.It Li PMC_CPU_INTEL_ATOM
+.Tn Intel
+.Tn Atom
+CPUs and other CPUs conforming to version 3 of the
+.Tn Intel
+performance measurement architecture.
+.It Li PMC_CPU_INTEL_CORE
+.Tn Intel
+.Tn Core Solo
+and
+.Tn Core Duo
+CPUs, and other CPUs conforming to version 1 of the
+.Tn Intel
+performance measurement architecture.
+.It Li PMC_CPU_INTEL_CORE2
+.Tn Intel
+.Tn "Core2 Solo" ,
+.Tn "Core2 Duo"
+and
+.Tn "Core2 Extreme"
+CPUs, and other CPUs conforming to version 2 of the
+.Tn Intel
+performance measurement architecture.
+.It Li PMC_CPU_INTEL_P5
 .Tn Intel
 .Tn "Pentium"
 CPUs.
-.It PMC_CPU_INTEL_P6
+.It Li PMC_CPU_INTEL_P6
 .Tn Intel
 .Tn "Pentium Pro"
 CPUs.
-.It PMC_CPU_INTEL_PII
+.It Li PMC_CPU_INTEL_PII
 .Tn "Intel Pentium II"
 CPUs.
-.It PMC_CPU_INTEL_PIII
+.It Li PMC_CPU_INTEL_PIII
 .Tn "Intel Pentium III"
 CPUs.
-.It PMC_CPU_INTEL_PM
+.It Li PMC_CPU_INTEL_PIV
+.Tn "Intel Pentium 4"
+CPUs.
+.It Li PMC_CPU_INTEL_PM
 .Tn "Intel Pentium M"
 CPUs.
-.It PMC_CPU_INTEL_PIV
-.Tn "Intel Pentium 4"
-CPUs.
 .El
 .Ss Supported PMCs
 PMC supported by this library are named by the
 .Vt enum pmc_class
 enumeration.
 Supported PMC kinds include:
-.Bl -tag -width PMC_CLASS_TSC -compact
-.It PMC_CLASS_K7
+.Bl -tag -width "Li PMC_CLASS_IA_FIXED" -compact
+.It Li PMC_CLASS_IA
+Programmable hardware counters present in CPUs conforming to the
+.Tn Intel
+performance measurement architecture version 1 and later.
+.It Li PMC_CLASS_IA_FIXED
+Fixed function hardwre counters presents in CPUs conforming to the
+.Tn Intel
+performance measurement architecture version 2 and later.
+.It Li PMC_CLASS_K7
 Programmable hardware counters present in
 .Tn "AMD Athlon"
 CPUs.
-.It PMC_CLASS_K8
+.It Li PMC_CLASS_K8
 Programmable hardware counters present in
 .Tn "AMD Athlon64"
 CPUs.
-.It PMC_CLASS_P4
+.It Li PMC_CLASS_P4
 Programmable hardware counters present in
 .Tn "Intel Pentium 4"
 CPUs.
-.It PMC_CLASS_P5
+.It Li PMC_CLASS_P5
 Programmable hardware counters present in
 .Tn Intel
 .Tn Pentium
 CPUs.
-.It PMC_CLASS_P6
+.It Li PMC_CLASS_P6
 Programmable hardware counters present in
 .Tn Intel
 .Tn "Pentium Pro" ,
@@ -190,7 +221,7 @@
 and
 .Tn "Pentium M"
 CPUs.
-.It PMC_CLASS_TSC
+.It Li PMC_CLASS_TSC
 The timestamp counter on i386 and amd64 architecture CPUs.
 .El
 .Ss PMC Capabilities
@@ -200,31 +231,35 @@
 .Vt "enum pmc_caps"
 enumeration.
 Supported capabilities include:
-.Bl -tag -width "PMC_CAP_INTERRUPT" -compact
-.It PMC_CAP_EDGE
+.Bl -tag -width "Li PMC_CAP_INTERRUPT" -compact
+.It Li PMC_CAP_CASCADE
+The ability to cascade counters.
+.It Li PMC_CAP_EDGE
 The ability to count negated to asserted transitions of the hardware
 conditions being probed for.
-.It PMC_CAP_INTERRUPT
+.It Li PMC_CAP_INTERRUPT
 The ability to interrupt the CPU.
-.It PMC_CAP_INVERT
+.It Li PMC_CAP_INVERT
 The ability to invert the sense of the hardware conditions being
 measured.
-.It PMC_CAP_READ
-PMC hardware allows the CPU to read performance counters.
-.It PMC_CAP_QUALIFIER
+.It Li PMC_CAP_PRECISE
+The ability to perform precise sampling.
+.It Li PMC_CAP_QUALIFIER
 The hardware allows monitored to be further qualified in some
 system dependent way.
-.It PMC_CAP_SYSTEM
+.It Li PMC_CAP_READ
+The ability to read from performance counters.
+.It Li PMC_CAP_SYSTEM
 The ability to restrict counting of hardware events to when the CPU is
 running privileged code.
-.It PMC_CAP_THRESHOLD
+.It Li PMC_CAP_THRESHOLD
 The ability to ignore simultaneous hardware events below a
 programmable threshold.
-.It PMC_CAP_USER
+.It Li PMC_CAP_USER
 The ability to restrict counting of hardware events to those when the
 CPU is running unprivileged code.
-.It PMC_CAP_WRITE
-PMC hardware allows CPUs write to counters.
+.It Li PMC_CAP_WRITE
+The ability to write to performance counters.
 .El
 .Ss Functional Grouping
 This section contains a brief overview of the available functionality

==== //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/Makefile#2 (text+ko) ====

@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 #
-# Original Revision: 1.8
-# $FreeBSD: src/release/doc/zh_CN.GB2312/Makefile,v 1.3 2007/12/09 23:37:06 delphij Exp $
+# Original Revision: 171847
+# $FreeBSD: src/release/doc/zh_CN.GB2312/Makefile,v 1.4 2008/09/17 18:13:37 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/..
 

==== //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/errata/Makefile#2 (text+ko) ====

@@ -1,5 +1,5 @@
-# Original Revision: 1.5
-# $FreeBSD: src/release/doc/zh_CN.GB2312/errata/Makefile,v 1.2 2007/12/09 23:37:06 delphij Exp $
+# Original Revision: 82872
+# $FreeBSD: src/release/doc/zh_CN.GB2312/errata/Makefile,v 1.3 2008/09/17 18:13:37 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR

==== //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/errata/article.sgml#2 (text+ko) ====

@@ -10,7 +10,7 @@
 
 	The FreeBSD Simplified Chinese Project
 
-	Original Revision: 1.73
+	Original Revision: 145264
 -->
 
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
@@ -40,7 +40,7 @@
     The &os; Project
     </corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.5 2006/03/07 02:29:21 delphij Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/errata/article.sgml,v 1.6 2008/09/17 18:13:37 delphij Exp $</pubdate>
 
     <copyright>
       <year>2000</year>

==== //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/hardware/Makefile#2 (text+ko) ====

@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
 #
-# Original Revision: 1.10
-# $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/Makefile,v 1.2 2007/12/09 23:37:06 delphij Exp $
+# Original Revision: 166821
+# $FreeBSD: src/release/doc/zh_CN.GB2312/hardware/Makefile,v 1.3 2008/09/17 18:13:37 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 

==== //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/hardware/article.sgml#2 (text+ko) ====

@@ -18,7 +18,7 @@
 
   <corpauthor>The &os; Documentation Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/article.sgml,v 1.1 2007/12/09 23:37:06 delphij Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/hardware/article.sgml,v 1.2 2008/09/17 18:13:37 delphij Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -391,7 +391,7 @@
 <!--
 	The FreeBSD Simplified Chinese Project
 
-	Original Revision: 1.326
+	Original Revision: 180321
 -->
 
 <!--
@@ -494,6 +494,8 @@
 
     &hwlist.hptmv;
 
+    &hwlist.hptrr;
+
     &hwlist.ida;
 
     &hwlist.iir;
@@ -523,8 +525,6 @@
 
     &hwlist.pst;
 
-    &hwlist.rr232x;
-
     &hwlist.stg;
 
     &hwlist.sym;
@@ -688,13 +688,6 @@
 
   </sect2>
 
-  <sect2 id="tokenring">
-    <title>Token Ring Interfaces</title>
-
-    &hwlist.oltr;
-
-  </sect2>
-
   <sect2 id="fddi">
     <title>FDDI ½Ó¿Ú</title>
     <para>[&arch.i386, &arch.pc98;] DEC DEFPA PCI (&man.fpa.4; Çý¶¯³ÌÐò)</para>
@@ -728,10 +721,6 @@
 
     &hwlist.ath;
 
-    &hwlist.awi;
-
-    &hwlist.cnw;
-
     <para>[&arch.i386;, &arch.amd64;] Intel PRO/Wireless 2100 MiniPCI ÍøÂçÊÊÅäÆ÷
       (&man.ipw.4; Çý¶¯³ÌÐò)</para>
 
@@ -771,13 +760,6 @@
 
     &hwlist.ctau;
 
-    <para>[&arch.i386;]Granch SBNI12 µã¶ÔµãͨѶÊÊÅäÆ÷
-    (&man.sbni.4; Çý¶¯³ÌÐò)
-    </para>
-
-    <para>[&arch.i386;]Granch SBNI16 SHDSL µ÷Öƽâµ÷Æ÷ (&man.sbsh.4;
-      Çý¶¯³ÌÐò)</para>
-
     &hwlist.cm;
 
   </sect2>

==== //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/readme/Makefile#2 (text+ko) ====

@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
-# Original Revision: 1.7
+# Original Revision: 82872
 #
-# $FreeBSD: src/release/doc/zh_CN.GB2312/readme/Makefile,v 1.1 2004/10/15 06:43:47 delphij Exp $
+# $FreeBSD: src/release/doc/zh_CN.GB2312/readme/Makefile,v 1.2 2008/09/17 18:13:37 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 .ifdef NO_LANGCODE_IN_DESTDIR

==== //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/readme/article.sgml#2 (text+ko) ====

@@ -2,7 +2,7 @@
 	The FreeBSD Documentation Project
 	The FreeBSD Simplified Chinese Project
 
-	Original Revision: 1.40
+	Original Revision: 179456
 -->
 <!DOCTYPE article PUBLIC "-//FreeBSD//DTD DocBook V4.1-Based Extension//EN" [
 <!ENTITY % articles.ent PUBLIC "-//FreeBSD//ENTITIES DocBook FreeBSD Articles Entity Set//EN">
@@ -18,7 +18,7 @@
 
     <corpauthor>The &os; Project</corpauthor>
 
-    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.4 2007/12/09 23:37:09 delphij Exp $</pubdate>
+    <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/readme/article.sgml,v 1.5 2008/09/17 18:13:37 delphij Exp $</pubdate>
 
     <copyright>
       <year>2000</year>
@@ -29,6 +29,7 @@
       <year>2005</year>
       <year>2006</year>
       <year>2007</year>
+      <year>2008</year>
       <holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
     </copyright>
 
@@ -63,8 +64,8 @@
 	»ùÓÚ Intel Itanium Processor µÄ¼ÆËã»ú (&arch.ia64;)£¬
 	NEC PC-9801/9821 ϵÁÐ PC ¼°Æä¼æÈÝ»ú (&arch.pc98;)£¬
 	ÒÔ¼° &ultrasparc; »úÆ÷ (&arch.sparc64;)¡£
-	Ö§³Ö &powerpc; (&arch.powerpc;) ºÍ &mips; (mips)
-	Ó²¼þ¼Ü¹¹µÄµÄ°æ±¾Ò²ÕýÔÚ¿ª·¢ÖС£
+	Ö§³Ö &arm; (&arch.arm;)¡¢ &mips; (&arch.mips;) ºÍ
+	&powerpc; (&arch.powerpc;) Ó²¼þ¼Ü¹¹µÄµÄ°æ±¾Ò²ÕýÔÚ¿ª·¢ÖС£
 	&os; Ö§³Ö¸÷ÖÖ¸÷ÑùµÄÍâΧÉ豸£¬
 	¿ÉÒÔʤÈÎÈí¼þ¿ª·¢¡¢ÓÎÏ·£¬ÒÔ¼°Ìṩ Internet
 	·þÎñµÈµÄ¸÷ʽӦÓá£</para>

==== //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/relnotes/Makefile#2 (text+ko) ====

@@ -1,7 +1,7 @@
 # The FreeBSD Simplified Chinese Project
-# Original Revision: 1.11
+# Original Revision: 164989
 #
-# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/Makefile,v 1.3 2007/12/09 23:37:09 delphij Exp $
+# $FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/Makefile,v 1.4 2008/09/17 18:13:37 delphij Exp $
 
 RELN_ROOT?= ${.CURDIR}/../..
 

==== //depot/projects/mpsafetty/release/doc/zh_CN.GB2312/relnotes/article.sgml#2 (text+ko) ====

@@ -6,12 +6,9 @@
 %release;
 
 <!-- The FreeBSD Simplified Chinese Project -->
-<!-- Original Revision: 1.1068.2.18 -->
+<!-- Original Revision: 182873 -->
 <!-- Text constants which probably don't need to be changed.-->
 
-<!-- The marker for MFCs. -->
-<!ENTITY merged "[ÒѺϲ¢]">
-
 <!ENTITY % include.historic "IGNORE">
 <!ENTITY % no.include.historic "IGNORE">
 ]>
@@ -22,7 +19,7 @@
 
   <corpauthor>The &os; Project</corpauthor>
 
-  <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/article.sgml,v 1.1 2007/12/09 23:37:09 delphij Exp $</pubdate>
+  <pubdate>$FreeBSD: src/release/doc/zh_CN.GB2312/relnotes/article.sgml,v 1.2 2008/09/17 18:13:37 delphij Exp $</pubdate>
 
   <copyright>
     <year>2000</year>
@@ -33,6 +30,7 @@
     <year>2005</year>
     <year>2006</year>
     <year>2007</year>
+    <year>2008</year>
     <holder role="mailto:doc at FreeBSD.org">The &os; Documentation Project</holder>
   </copyright>
 
@@ -122,44 +120,8 @@
   <sect2 id="security">
     <title>°²È«¹«¸æ</title>
 
-    <para>ÐÞÕýÁË 2 ¸ö BIND Ô¶³Ì¾Ü¾ø·þÎñµÄÎÊÌâ £¨Ò»¸ö¹ØÓÚ DNSSEC
-      Ò»¸ö¹ØÓÚ DNS µÝ¹é²éѯ£©¡£
-      ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:02.bind.asc">FreeBSD-SA-07:02.bind</ulink>. &merged;</para>
-
-    <para>ÏÖÔÚ¿ÉÒÔͨ¹ýÉèÖà <varname>net.inet6.ip6.rthdr0_allowed</varname>
-      sysctl ±äÁ¿À´¿ØÖÆ IPv6 ÀàÐÍ 0 ·ÓÉÍ·µÄ´¦Àí¡£
-      ĬÈÏֵΪ<literal>0</literal> (off)¡£
-      ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:03.ipv6.asc">FreeBSD-SA-07:03.ipv6</ulink>. &merged;</para>
-
-    <para>ÐÞÕýÁË &man.file.1 ¹¤¾ß £¨ºÍÆäÒÀÀµµÄ &man.libmagic.3; ¿â£©
-      Ò»¸öDZÔڵĶÑÒç³öÎÊÌâ¡£
-      ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:04.file.asc">FreeBSD-SA-07:04.file</ulink>. &merged;</para>
-
-    <para>ÐÞÕýÁË &man.libarchive.3; ºÍ &man.tar.1;
-      ´¦ÀíËð»µµÄ &man.tar.5; ¹éµµÎļþµÄ´íÎó¡£
-      ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:05.libarchive.asc">FreeBSD-SA-07:05.libarchive</ulink>. &merged;</para>
-
-    <para>ÐÞÕýÁË &man.tcpdump.1; Öлº³åÇøÒç³öµÄÎÊÌâ¡£
-      ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:06.tcpdump.asc">FreeBSD-SA-07:06.tcpdump</ulink>. &merged;</para>
+    <para></para>
 
-    <para>ÐÞÕýÁËÒ»¸ö &man.named.8; ÖеĴíÎó£¬
-      Õâ¸ö´íÎó»áµ¼Ö¹¥»÷ÕßÄܹ»ÆÆ»µ½âÎöÆ÷µÄ DNS »º´æ¡£
-      ÒªÁ˽â½øÒ»²½ÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:07.bind.asc">FreeBSD-SA-07:07.bind</ulink>. &merged;</para>
-
-    <para>ÐÞÕýÁËÒ»¸ö OpenSSL Öлº³åÇøÒç³öµÄÎÊÌâ
-      (ÓÉÇ°Ò»¸ö°²È«²¹¶¡µÄ´íÎóÐÞ¸ÄÔì³É)¡£
-      Òª½øÒ»²½Á˽âÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:08.openssl.asc">FreeBSD-SA-07:08.openssl</ulink>. &merged;</para>
-
-    <para>ÐÞÕýÁËÒ»¸ö &man.random.4; ¿ÉÄÜй©ǰһ´ÎÉú³ÉÊý¾ÝµÄȱÏÝ¡£
-      Òª½øÒ»²½Á˽âÏêÇ飬 Çë²ÎÔÄ°²È«¹«¸æ
-      <ulink url="http://security.FreeBSD.org/advisories/FreeBSD-SA-07:09.random.asc">FreeBSD-SA-07:09.random</ulink>. &merged;</para>
   </sect2>
 
   <sect2 id="kernel">
@@ -167,1207 +129,290 @@
     
     <para>&man.acpi.4; ÌṩÁË¶Ô HPET ʱÖÓ¼ÆÊýÆ÷µÄ»ù±¾Ö§³Ö¡£&merged;</para>
 
-    <para>&man.acpi.ibm.4; Çý¶¯ÌṩÁ˽«·çÉÈÅäÖÃΪÊÖ¶¯»ò×Ô¶¯¿ØÖÆ£¬
-      ÒÔ¼°ÔÚÊÖ¶¯¿ØÖÆģʽϵ÷½Ú·çÉÈתËÙµÄÄÜÁ¦¡£ ÒªÆôÓöԷçÉÈתËÙµÄÊÖ¶¯¿ØÖÆ£¬
-      ÐèÒª½« sysctl ±äÁ¿ <varname>dev.acpi_ibm.<replaceable>0</replaceable>.fan</varname>
-      ÉèÖÃΪÁã (ÊÖ¶¯)¡£ ÕâÑù×öʱ±ØÐë·Ç³£Ð¡ÐÄ£¬ÒòΪ½ûÓÃ×Ô¶¯·çÉÈ¿ØÖÆ£¬
-      ¿ÉÄÜ»áʹӲ¼þ¹ýÈÈ£¬ ´Ó¶øµ¼ÖÂÓÀ¾ÃÐÔµÄË𻵡£</para>
+    <para>ÐÂÔöÁËÓÃÓÚ½«Ïß³ÌÓë CPU °ó¶¨£¬ ÒÔ¼°¶Ô CPU ×ÊÔ´½øÐзÖ×éºÍ·ÖÅäµÄ
+      &man.cpuset.2; API¡£ ͬʱ»¹¼ÓÈëÁËÓÃÓÚ¹ÜÀí´¦ÀíÆ÷×éµÄÓû§»·¾³¹¤¾ß
+      &man.cpuset.1;¡£</para>
 
-    <para>¸Ä½øÁË &man.apm.4; ¹ÒÆð/»½ÐÑ Ö§³Ö¡£</para>
+    <para role="merged">ΪÄں˵÷ÊÔÆ÷ &man.ddb.4; ÐÂÔöÁËÊä³ö²¶×½»úÖÆ¡£
+      À´×Ô &man.ddb.4; µÄÊäÈëºÍÊä³öÄÚÈÝ»á×Ô¶¯²¶×½µ½Ò»¸öÄڴ滺³åÇø£¬
+      ÒÔ±ãÔÚËæºóͨ¹ý &man.sysctl.8; »ò textdump À´¶ÁÈ¡ºÍ·ÖÎö¡£
+      ÐÂÔöµÄ <command>capture</command> ÃüÁî¿ÉÒÔ¿ØÖÆÕâ¸ö¹¦ÄÜ¡£</para>
 
-    <para>&man.cpufreq.4; CPU ƵÂÊ¿ØÖÆ¿ò¼ÜÏÖÒÑÔÚ 
-      <filename>GENERIC</filename> ĬÈÏÄÚºËÖÐÆôÓá£</para>
+    <para role="merged">Ϊ &man.ddb.4; µ÷ÊÔÆ÷ÐÂÔöÁ˼òµ¥µÄ½Å±¾»úÖÆÖ§³Ö£¬
+      ʹÆäÄܹ»Ö§³ÖÒ»×é¾­¹ýÃüÃûµÄ°üº¬Ò»ÏµÁÐ &man.ddb.4; ÃüÁîµÄ½Å±¾¡£
+      ÕâЩ½Å±¾¿ÉÒÔÔÚ &man.ddb.4; ÖУ¬ »òͨ¹ýÐÂÔöµÄ &man.ddb.8;
+      À´½øÐÐÅäÖᣠ¸ü¶àÏêÇéÇë²Î¼ûÁª»úÊÖ²á &man.ddb.4;¡£</para>
 
-    <para>¶Ô Camellia ¿éÃÜÂëµÄÖ§³ÖÒѱ»¼ÓÈëµ½ &os; Äںˡ£
-      ËüÄܱ»Ö¸¶¨Îª &man.ipsec.4; ºÍ &man.geli.8; µÄ¿éËã·¨¡£
-      ¸ü¶à¹ØÓÚ Camellia µÄÐÅÏ¢Äܹ»ÔÚ RFC 4132 ÖÐÕÒµ½¡£</para>
+    <para role="merged">ÄÚºËÐÂÔöÁË textdump ¸ñʽµÄÖ÷´æÄÚÈÝת´æÄÜÁ¦¡£
+      Ó봫ͳÖ÷´æÄÚÈÝת´æ·½Ê½²»Í¬£¬ textdump
+      ͨ¹ýһϵÁлúе»¯µÄÉú³É/ÌáÈ¡µ÷ÊÔÊä³öÀ´Ìṩ¸ßÒ»¼¶µÄÐÅÏ¢¡£
+      Õâ¸ö»úÖƼ´Ê¹ÔÚÄÚºËûÓаüº¬µ÷ÊÔ·ûºÅ£¬ »òÔ´´úÂëÓëÄں˲»Íêȫͬ²½µÄÇé¿öÏ£¬
+      ÈÔÈ»Äܹ»Ìṩ¼òÃ÷µ«ÄÚÈݷḻµÄµ÷ÊÔÐÅÏ¢¡£ ¹ØÓÚÕâÒ»»úÖƵĽøÒ»²½ÏêÇéÇë²Î¼ûÁª»úÊÖ²á
+      &man.textdump.4;¡£</para>
 
-    <para>ÓÉÓÚÒѾ­²»ÔÙÐèÒª£¬ ÄÚºËÅäÖÃÑ¡Ïî <literal>options COMPAT_43</literal>
-      ÒѾ­´Ó <filename>GENERIC</filename> ¼°Ïà¹ØÅäÖÃÎļþÖÐɾ³ý¡£
-      ÕâÒ»±ä¶¯¿ÉÒÔΪijЩ³ÌÐò´øÀ´Î¢Ð¡µÄÐÔÄÜÌáÉý¡£</para>
+    <para>ɾȥÁË¶Ô M:N Ïß³ÌÄ£Ð͵ÄÄÚºËÖ§³Ö¡£
+      ¾¡¹Ü KSE (Äں˵÷¶ÈʵÌå) ÏîÄ¿³É¹¦µØ½«Ïß³ÌÒýÈëÁË FreeBSD£¬ ÓÉ
+      kse Ï߳̿â²ÉÓÃµÄ M:N Ïß³ÌÄ£ÐÍδÄÜ·¢»ÓÆäÈ«²¿Ç±ÄÜ¡£
+      ¶ÔÓÚ½ÏÔçµÄÒÔ¶¯Ì¬·½Ê½Áª±àµÄʹÓà KSE Ïß³ÌÄ£Ð͵ÄÓ¦ÓõÄÏòÇ°¼æÈÝÐÔ£¬
+      ¿ÉÒÔͨ¹ý &man.libmap.conf.5; ÅäÖÃʵÏÖ¡£ The &os; Project ·Ç³£¸Ðл
+      &a.julian;¡¢ &a.deischen; ºÍ &a.davidxu; ÔÚ KSE Ö§³Ö·½ÃæËù×öµÄ¹¤×÷¡£</para>
 
-    <para>ÑÆÖÕ¶ËÇý¶¯ (&man.dcons.4;) ÔÚ
-      <filename>GENERIC</filename> ÄÚºËĬÈÏÆôÓá£</para>
+    <para>&os; ÄÚºËÏÖÔÚÄܹ»Í¨¹ý <varname>kern.features</varname> sysctl
+      Ê÷À´²éѯÌض¨µÄ¹¦ÄÜÊÇ·ñÒÑÁª±à»ò¶¯Ì¬¼ÓÔؽøÄÚºËÁË¡£
+      ¿âº¯Êý &man.feature.present.3; ΪÓû§Ì¬Ó¦ÓóÌÐòÌṩÁ˼ì²â¹¦ÄÜÊÇ·ñ´æÔڵļò±ã½Ó¿Ú¡£</para>
 
-    <para>&man.ddb.4; µ÷ÊÔÆ÷ÐÂÔöÁË <literal>show sleepq</literal>
-      ÃüÁî¡£ Õâ¸öÃüÁîÐèÒªÖ¸¶¨Ò»¸öµÈ´ýͨµÀ×÷ΪÆä²ÎÊý£¬
-      Æð×÷ÓÃÊÇÏÔʾÓëÄÇÒ»µÈ´ýͨµÀ¹ØÁªµÄÐÝÃ߶ÓÁС£</para>
+    <para arch="amd64">&os; ÄÚºËÖ§³Ö³¬´óÄÚ´æÒ³ (<quote>superpages</quote>) Ó³ÉäÁË¡£</para>
 
-    <para>ÐÞÕýÁËÎļþÃèÊö·û´¦ÀíÖеÄÒ»¸ö»áµ¼ÖÂÔÚijЩÇé¿öÏ°´
-      <literal>close(0); dup(fd)</literal> ˳ÐòÖ´ÐÐʱ²»·µ»ØÃèÊö·û
-      <literal>0</literal> µÄ bug¡£</para>
-
-    <para>&man.gdb.1; Ô¶³Ìµ÷ÊÔ½Ó¿ÚÌṩÁ˶ÔÓÚ½«¿ØÖÆ̨ÐÅÏ¢¸´ÖƵ½Ô¶³Ìµ÷ÊÔÆ÷ʵÀýµÄÄÜÁ¦¡£
-      ÒªÆôÓÃÕâÒ»ÌØÐÔ£¬ ÐèÒªÔÚ  <filename>loader.conf</filename>
-      ÖÐÅäÖà <literal>debug.gdbcons="1"</literal>£¬
-      ²¢ÔÚ¼ÓÔØÆ÷Ìáʾ·û³öÏÖʱÊäÈë <literal>boot -d;
-	gdb; step</literal>£¬ ÔÙ´ÓÔ¶³Ì»úÆ÷¹Ò½Ó &man.gdb.1;¡£
-      sysctl ±äÁ¿ <varname>debug.gdbcons</varname> ¿ÉÒÔÓÃÀ´¿ØÖÆÕâÒ»¹¦ÄܵĿª¹Ø״̬¡£</para>
-
-    <para>&man.hwpmc.4; ºÍ &man.pmcstat.8; ÌṩÁ˶Զ¯Ì¬¼ÓÔصÄÄÚºËÄ£¿éÒÔ¼°Í¨¹ý
-      &man.dlopen.3; ¼ÓÔصĶ¯Ì¬Á¬½Ó¿âµÄÐÔÄÜ·ÖÎöÖ§³Ö¡£
-      &man.pmcstat.8; ÐÂÔöÁËͨ¹ýÍøÂç socket ½«Êý¾Ý¼Ç¼µ½Ô¶³ÌÖ÷»úµÄÄÜÁ¦¡£</para>
-
-    <para>ÐÂÔöÒ»¸ö sysctl ±äÁ¿ <varname>kern.hostuuid</varname>
-      ÓÃÀ´±£´æÈ«¾ÖΨһ±êʶ·û (UUID)¡£ ´Ë UUID ÊÇÓÉ
-      <filename>rc.d/hostid</filename> Æô¶¯½Å±¾¼ÆËãÉú³É£¬
-      ΪʹÆäÔÚÿ´ÎµÄϵͳÖØÆôºó²»¶ªÊ§£¬Ëü»á±»±£´æÔÚ´ÅÅÌÉÏ¡£</para>
-
-    <para>¶ÔÄÚºËÅäÖÃÑ¡Ïî <option>INCLUDE_CONFIG_FILE</option> ½øÐÐÁ˸Ľø¡£
-      ÕýÔÚÔËÐеÄÄں˵ÄÍêÕûÅäÖ㬠¿ÉÒÔͨ¹ý <command>sysctl -b kern.conftxt</command>
-      À´Ö±½ÓÌáÈ¡ÁË¡£ ´ËÍ⣬ Ò²¿ÉÒÔͨ¹ý
-      <command>config -x kernelfile</command> ´ÓÄÚºËÎļþÖÐÌáÈ¡ÅäÖÃÎļþ¡£
-      Èç¹ûÏ£Íû±£³ÖÅäÖÃÎļþÖеÄ×¢ÊÍ£¬ ¿ÉÒÔʹÓà &man.config.8; µÄ
-      <option>-C</option> Ñ¡Ïî¡£</para>
-
-    <para>¶ÔÓÚÄں˵÷¶ÈʵÌå (KSE) µÄÖ§³Ö±ä³ÉÁËÄÚºËÑ¡Ïî (¹ýÈ¥ÊÇÄÚºËÖеıØÑ¡¹¦ÄÜ)¡£
-      ÔÚ³ýÁË &arch.sun4v; Ö®ÍâµÄËùÓÐÓ²¼þ¼Ü¹¹µÄ GENERIC ÄÚºËÖУ¬
-      ¶¼ÒÀȻĬÈÏÆôÓÃÕâÒ»¹¦ÄÜ (Òò¶øÕâÒ»±ä¶¯²¢²»»á²úÉú¹¦ÄÜÉϵı仯)¡£</para>
-
-    <para>¶Ô Linux ABI Ö§³Ö½øÐÐÁËÔöÇ¿£¬ ÒÔÖ§³Ö¶Ô
-      Linux 2.6.16 µÄÄ£Äâ¡£ ÕâÒ»¹¦ÄÜĬÈϲ¢²»ÆôÓá£
-      Èç¹ûÏ£ÍûÆôÓ㬠ÔòÐèҪͨ¹ý½« <varname>compat.linux.osrelease</varname>
-      sysctl ±äÁ¿ÉèÖÃΪ <literal>2.6.16</literal>¡£ Çë×¢Ò⣬
-      ÕâÒ»Ö§³ÖÄ¿Ç°ÈÔÊÇÊÔÑéÐԵġ£</para>
-
-    <para>ÔÚÄÚºËµÄ PCI Ö§³Ö´úÂëÖÐÐÂÔöÁ˶ÔÓÚ ÏûÏ¢ÐźÅÖÐ¶Ï (MSI) ÒÔ¼°
-      À©Õ¹ÏûÏ¢ÐźÅÖÐ¶Ï (MSI-X) µÄÖ§³Ö¡£ &merged;</para>
-
-    <para>ÐÂÔöÁËÄÚºË½Ó¿Ú &man.priv.9;¡£ Æä×÷ÓÃÊǼì²éÏ̼߳°ÐÅÈÎ×´ÊÇ·ñÓµÓÐijЩÌØȨ¡£
-      ÓëÏÖÓÐµÄ &man.suser.9; ½Ó¿Ú²»Í¬£¬ &man.priv.9; ²ÉÓ÷ûºÅ»¯µÄÃû³ÆÀ´±êʾÌØȨ£¬
-      ÕâÑù¾Í±ãÓÚ±í´ï¸ü¸´ÔÓһЩµÄÌØȨÊÚÓè²ßÂÔÁË¡£</para>
-
-    <para>&os; Äܹ»Ö§³Ö¶ÔͬһÎļþµÄ²¢·¢ &man.read.2;/&man.readv.2;
-      ·ÃÎÊÁË¡£</para>
-
-    <para>ÄÚºËµÄ &man.sx.9; Ëø½øÐÐÁËÓÅ»¯£¬ ÔÚ¶àÊýÇé¿öϲÉÓüòµ¥µÄÔ­×Ó²Ù×÷£¬
-      À´»ñµÃºÍÊͷŹ²Ïí¼°»¥³âËø¡£ ¾¡¹ÜÕâÒ»±ä¶¯Ò»°ã¶øÑÔ²¢²»ÊÇÓû§¿É¼ûµÄ£¬
-      µ«Ëü´øÀ´ÁËÏ൱¿É¹ÛµÄÐÔÄܸÄÉÆ¡£o</para>
-
-    <para>¶Ô ULE ½ø³Ìµ÷¶ÈÆ÷½øÐÐÁËÐ޸ģ¬ ÒԸĽøÆäÐÐΪ£¬
-      ÌرðÊÇÔڸ߸ºÔØÌõ¼þϵĻ¥²Ù×÷ÐÔÓ¦Óã¬
-      ÒÔ¼°Õë¶Ôµ¥´¦ÀíÆ÷ºÍ¶à´¦ÀíÆ÷ϵͳµÄ¸ÄÁ¼¡£
-      ÕâЩ¸Ä½øÒ²±»³Æ×÷ <quote>ULE
-      3.0</quote>¡£ (ULE 3.0 ÏÈÇ°Ôø±»³Æ×÷ SCHED_SMP£¬
-      Ëü»ùÓÚ ULE µ÷¶ÈÆ÷µÄ 2.0 °æ±¾¡£
-      ULE 2.0 ²¢Î´ÔÚÒѾ­·¢ÐйýµÄ &os; ·¢Ðаæ
-      ÖгöÏÖ¹ý£¬ µ«Æ俪·¢¹ý³ÌÖнøÐÐÁË´óÁ¿µÄÐ޸ġ¢
-      ²âÊÔÒÔ¼°ÐÔÄÜÆÀ¹À¡£)</para>
-
-    <para>ÐÂÔöÁË <literal>SIGCHLD</literal> ÐźŶÓÁÐÄÜÁ¦¡£
-      ¶ÔÓÚ״̬·¢Éú±ä»¯µÄ×Ó½ø³Ì£¬ Äں˻ᱣ³ÖÔÚ¶ÓÁÐÖеÄÒ»¸öÓëÖ®¶ÔÓ¦µÄ
-      <literal>SIGCHLD</literal> ʵÀý¡£ Èç¹ûûÓжÔÐźŽøÐд¦Àí£¬
-      ²¢ÇÒ½ø³Ì¶Ô´Ë¸Ä±ä״̬£¬ ÔòÐźÅÐÅÏ¢»á±»¸üУ¬ ÒÔ·´Ó³×îеĽø³Ì״̬¡£
-      ÐÂÔöµÄÒýµ¼¼ÓÔØÆ÷Ñ¡Ïî <varname>kern.sigqueue.queue_sigchild</varname>
-      ¿ÉÒÔ¿ØÖÆÕâÒ»ÐÐΪ£¬ ½«ÆäÉèÖÃΪÁã±íʾ½ûÓÃ
-      <literal>SIGCHLD</literal> ¶ÓÁй¦ÄÜ¡£</para>
-
-    <para>ÐÂÔöÁË sysctl ±äÁ¿ <varname>kern.malloc_stats</varname>¡£
-      ËüÄܹ»ÒÔ¶þ½øÖÆÁ÷»¯µÄÊý¾Ý½á¹¹ÐÎʽµ¼³öÄÚºË malloc µÄͳ¼ÆÊý¾Ý¡£</para>
-
-    <para>ÐÂÔöÁË sysctl ±äÁ¿ <varname>kern.forcesigexit</varname>¡£
-      Èç¹ûÉèÖÃÁËÕâ¸ö±äÁ¿£¬ ²¢ÇÒ trap Ðźű»µ±Ç°Ïß³ÌÕ¼ÓУ¬ »ò±»½ø³ÌºöÂÔ£¬
-      Ëü»áÇ¿ÖÆÖ´ÐÐ sigexit¡£ ÕâÒ»¹¦ÄÜĬÈÏÆôÓá£</para>
-
-    <para>ɾȥÁËÓë &man.syscons.4; ÌṩÀàËƹ¦ÄÜµÄ pcvt(4) Çý¶¯³ÌÐò£¬
-      ÒòΪËüÒѾ­ÎÞ·¨ÊÊÓ¦ÄÚºËÖÐÆäËû²¿·ÖµÄ±ä»¯ÁË¡£</para>
-
-    <para>ʵÏÖÁË RedZone£¬ Ò»ÖÖÓÃÓÚÄÚºË &man.malloc.9;
-      µÄ»º³åÇøÒç³ö¼ì²â»úÖÆ¡£ ËüÄܹ»ÔÚÔËÐÐÖÐµÄ &man.free.9; ºÍ &man.realloc.9;
-      ʱ¿Ì¼ì²â»º³åÇøµÄÉÏÒçºÍÏÂÒ磬 ²¢ÏÔʾ·ÖÅäºÍÊÍ·ÅÄÚ´æµÄµ÷ÓÃÕ»¡£
-      ÈçÓûÁ˽â½øÒ»²½µÄÏêÇ飬 Çë²Î¼ûÁª»úÊÖ²á &man.redzone.9;¡£</para>
-
-    <para>ÐÂÔöÁËÒýµ¼¼ÓÔØÆ÷Ñ¡Ïî <varname>vm.kmem_size_min</varname>£¬
-      Õâ¸öÑ¡ÏîÓÃÓÚÖ¸¶¨
-      <varname>vm.kmem_size</varname> µÄ×îСֵ¡£</para>
-
-    <para>ÐÂÔöÁË sysctl ±äÁ¿ <varname>vm.zone_stats</varname>¡£
-      ËüÄܹ»ÒÔ¶þ½øÖÆÁ÷»¯µÄÊý¾Ý½á¹¹ÐÎʽµ¼³ö &man.uma.9; ·ÖÅäÆ÷µÄͳ¼ÆÊý¾Ý¡£</para>
-
-    <para>½« sysctl ±äÁ¿ <varname>hw.pci.do_powerstate</varname>
-      ·Ö²ð³ÉÁËÁ½¸ö sysctl ±äÁ¿
-      <varname>hw.pci.do_powerstate_nodriver</varname>
-      ºÍ <varname>hw.pci.do_powerstate_resume</varname>¡£
-      ÁíÍ⣬ ÕâЩ±äÁ¿Óɲ¼¶ûÖµ¸ÄΪÁË·¶Î§Öµ¡£
-      <literal>0</literal> ±íʾ²»½øÐÐÈκεçÔ´¹ÜÀí£¬
-      <literal>1</literal> ±íʾ±£ÊصçÔ´¹ÜÀí£¬ ¼´µ¼Ö¹ýÎÊÌâµÄÉ豸ÀàÐÍ£¬
-      »á±»¼ÓÈëµ½¼àÊÓÁбíÖУ¬
-      <literal>2</literal> ±íʾ¼¤½øµÄµçÔ´¹ÜÀí£¬
-      ±íʾ½«¶Ôϵͳ²»ÖØÒªµÄÉ豸¶¼¼ÓÈëµ½ÁбíÖУ¬
-      ¶ø <literal>3</literal> Ôò±íʾ½«È«²¿É豸µÄµçÔ´ÎÞÌõ¼þ¹Ø±Õ¡£
-      <varname>hw.pci.do_powerstate_nodriver</varname>
-      µÄĬÈÏÖµÊÇ <literal>0</literal>£¬ ¶ø
-      <varname>hw.pci.do_powerstate_resume</varname>
-      µÄĬÈÏÖµÔòÊÇ <literal>1</literal>¡£</para>
-
-    <para>[&arch.ia64;] ÔÚ <filename>GENERIC</filename> ÄÚºËÖÐĬÈÏÆôÓÃÁË
-      SMP Ö§³Ö¡£</para>
-
-    <para>ÐÂÔöÁËÓÃÒÔʾ·¶ÍйܷÃÎÊ¿ØÖÆ¿ò¼ÜµÄÄÚºËÅäÖÃÎļþ
-      <filename>src/sys/<replaceable>arch</replaceable>/conf/MAC</filename>¡£</para>
-
-    <para><varname>POSIX_TIMERS</varname> Ö§³Ö¸üе½ÁË 200112L¡£</para>
-
-    <para>ÐÂÔöÁË¶Ô POSIX ÏûÏ¢¶ÓÁеÄÊÔÑéÐÔÖ§³Ö¡£</para>
-
-    <para>¶Ô UNIX domain socket µÄÉÏËø²ßÂÔ½øÐÐÁËÐÞ¶©ÒÔ¸ÄÉÆÆä²¢·¢ÄÜÁ¦£»
-      ÕâÒ»±ä¶¯ÎªÒ»Ð© SMP ¼ÆË㸺ÔØ´øÀ´ÁËÏÔÖøµÄÐÔÄÜÌáÉý
-      (ÌرðÊÇÔÚ 8-· &arch.amd64; ϵͳÉÏÔËÐÐµÄ MySQL)£¬
-      ¶øÔÚ UP ϵͳÉÏÔò¼¸ºõûÓÐÔö¼ÓÆäËû¿ªÏú¡£</para>
-
-    <para>ΪÁËÖ§³Ö¹ýÂËʽÖжϴ¦Àí·½Ê½£¬ ¶Ô Newbus API
-      ½øÐÐÁËһЩ΢Сµ«·¶Î§ºÜ´óµÄÐ޸ġ£ ÓÉÓÚÕâЩ¸Ä¶¯Ò²»áʹÄÚºË ABI
-      ·¢Éú±ä»¯£¬ Òò´ËÈ«²¿µÚÈý·½É豸Çý¶¯³ÌÐòÒ²ÐèÒª½øÐÐÐ޸IJ¢ÖØбàÒë¡£</para>
+    <para arch="amd64,i386,ia64,powerpc" role="merged">ULE
+      µ÷¶ÈÆ÷³ÉΪÁË <filename>GENERIC</filename> Äں˵ÄĬÈϽø³Ìµ÷¶ÈÆ÷¡£</para>
 
     <sect3 id="boot">
       <title>Òýµ¼¼ÓÔØÆ÷±ä¶¯</title>
 
-      <para>ÐÂÔöÁËÓÃÓÚÉèÖÃÔÚ <filename>boot2</filename>
-	ÖÐÉèÖô®¿Ú¿ØÖÆ̨ËÙÂÊ£¬ ²¢¿ÉÓÃÓÚ <filename>/boot.config</filename>
-	Îļþ¼° <prompt>boot:</prompt> ÌáʾÐд¦µÄ <option>-S</option>
-	Ñ¡Ïî¡£</para>

>>> TRUNCATED FOR MAIL (1000 lines) <<<


More information about the p4-projects mailing list