Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 19 Sep 2008 18:36:29 GMT
From:      Ed Schouten <ed@FreeBSD.org>
To:        Perforce Change Reviews <perforce@FreeBSD.org>
Subject:   PERFORCE change 150133 for review
Message-ID:  <200809191836.m8JIaTBQ077096@repoman.freebsd.org>

next in thread | raw e-mail | index | archive | help

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

Change 150133 by ed@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@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@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; 库)
-      一个潜在的堆溢出问题。
-      要了解进一步详情, 请参阅安全公告
-      <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> 及相关配置文件中删除。
-      这一变动可以为某些程序带来微小的性能提升。</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>修正了文件描述符处理中的一个会导致在某些情况下按
-      <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;。 其作用是检查线程及信任状是否拥有某些特权。
-      与现有的 &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
-      发生变化, 因此全部第三方设备驱动程序也需要进行修改并重新编译。</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) <<<



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200809191836.m8JIaTBQ077096>