From owner-p4-releng  Fri Nov 15 13:10:44 2002
Delivered-To: p4-releng@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D2E9437B404; Fri, 15 Nov 2002 13:10:41 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 6DB1537B401
	for <perforce@freebsd.org>; Fri, 15 Nov 2002 13:10:41 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 0A01643E6E
	for <perforce@freebsd.org>; Fri, 15 Nov 2002 13:10:41 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gAFL82mV091182
	for <perforce@freebsd.org>; Fri, 15 Nov 2002 13:08:02 -0800 (PST)
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gAFL81Mq091168
	for perforce@freebsd.org; Fri, 15 Nov 2002 13:08:01 -0800 (PST)
Date: Fri, 15 Nov 2002 13:08:01 -0800 (PST)
Message-Id: <200211152108.gAFL81Mq091168@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
Subject: PERFORCE change 21085 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-releng@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-releng.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-releng>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-releng>
X-Loop: FreeBSD.ORG

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

Change 21085 by jhb@jhb_laptop on 2002/11/15 13:07:58

	Put back DP2 changes that I managed to save including a special
	note in the MOTD; using 5.0-DP2 in version, docs, and man pages;
	and turning off PSE and PG_G.

Affected files ...

.. //depot/releng/5_dp2/src/etc/motd#4 edit
.. //depot/releng/5_dp2/src/gnu/usr.bin/groff/tmac/mdoc.local#5 edit
.. //depot/releng/5_dp2/src/release/doc/share/sgml/release.ent#4 edit
.. //depot/releng/5_dp2/src/sys/conf/newvers.sh#4 edit
.. //depot/releng/5_dp2/src/sys/i386/conf/GENERIC#6 edit
.. //depot/releng/5_dp2/src/sys/i386/conf/OLDCARD#5 edit

Differences ...

==== //depot/releng/5_dp2/src/etc/motd#4 (text+ko) ====

@@ -22,3 +22,6 @@
 You may also use sysinstall(8) to re-enter the installation and
 configuration utility.  Edit /etc/motd to change this login announcement.
 
+** NOTE: This developer preview is not an officially supported release
+** of FreeBSD, and may contain serious bugs.  Please see the release
+** notes for more information about known issues.

==== //depot/releng/5_dp2/src/gnu/usr.bin/groff/tmac/mdoc.local#5 (text+ko) ====

@@ -51,7 +51,7 @@
 .ds doc-str-Lb-libvgl      Video Graphics Library (libvgl, \-lvgl)
 .
 .\" Default .Os value
-.ds doc-operating-system FreeBSD\~5.0
+.ds doc-operating-system FreeBSD\~5.0\~DP2
 .
 .ec
 .

==== //depot/releng/5_dp2/src/release/doc/share/sgml/release.ent#4 (text+ko) ====

@@ -6,7 +6,7 @@
 
 <!-- Version of the OS we're describing.  This needs to be updated
      with each new release. -->
-<!ENTITY release.current "5.0-CURRENT">
+<!ENTITY release.current "5.0-DP2">
 
 <!-- The previous version used for comparison in the "What's New"
      section.  For -CURRENT, we might point back to the last

==== //depot/releng/5_dp2/src/sys/conf/newvers.sh#4 (text+ko) ====

@@ -36,7 +36,7 @@
 
 TYPE="FreeBSD"
 REVISION="5.0"
-BRANCH="CURRENT"
+BRANCH="DP2"
 RELEASE="${REVISION}-${BRANCH}"
 VERSION="${TYPE} ${RELEASE}"
 

==== //depot/releng/5_dp2/src/sys/i386/conf/GENERIC#6 (text+ko) ====

@@ -65,6 +65,15 @@
 options 	WITNESS			#Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
+#
+# DP2-specific Options:
+#
+# Disable certain VM optimizations as they currently cause memory corruption
+# on newer Pentium4 and Athlon systems.
+#
+options 	DISABLE_PSE
+options 	DISABLE_PG_G
+
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O

==== //depot/releng/5_dp2/src/sys/i386/conf/OLDCARD#5 (text+ko) ====

@@ -61,6 +61,15 @@
 options 	WITNESS			#Enable checks to detect deadlocks and cycles
 options 	WITNESS_SKIPSPIN	#Don't run witness on spinlocks for speed
 
+#
+# DP2-specific Options:
+#
+# Disable certain VM optimizations as they currently cause memory corruption
+# on newer Pentium4 and Athlon systems.
+#
+options 	DISABLE_PSE
+options 	DISABLE_PG_G
+
 # To make an SMP kernel, the next two are needed
 #options 	SMP			# Symmetric MultiProcessor Kernel
 #options 	APIC_IO			# Symmetric (APIC) I/O

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-releng" in the body of the message