PERFORCE change 103278 for review

[John Birrell]

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

Change 103278 by jb at jb_freebsd2 on 2006/08/05 21:24:41

	IFC

Affected files ...

.. //depot/projects/dtrace/src/etc/defaults/rc.conf#13 integrate
.. //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#4 integrate
.. //depot/projects/dtrace/src/sys/sys/param.h#9 integrate

Differences ...

==== //depot/projects/dtrace/src/etc/defaults/rc.conf#13 (text+ko) ====

@@ -15,7 +15,7 @@
 # For a more detailed explanation of all the rc.conf variables, please
 # refer to the rc.conf(5) manual page.
 #
-# $FreeBSD: src/etc/defaults/rc.conf,v 1.290 2006/07/21 15:55:18 yar Exp $
+# $FreeBSD: src/etc/defaults/rc.conf,v 1.291 2006/08/05 20:28:50 njl Exp $
 
 ##############################################################
 ###  Important initial Boot-time options  ####################
@@ -516,9 +516,9 @@
 devfs_system_ruleset=""	# The name of a ruleset to apply to /dev
 devfs_set_rulesets=""	# A list of /mount/dev=ruleset_name settings to
 			# apply (must be mounted already, i.e. fstab(5))
-performance_cx_lowest="LOW"	# Online CPU idle state
+performance_cx_lowest="HIGH"	# Online CPU idle state
 performance_cpu_freq="NONE"	# Online CPU frequency
-economy_cx_lowest="LOW"		# Offline CPU idle state
+economy_cx_lowest="HIGH"	# Offline CPU idle state
 economy_cpu_freq="NONE"		# Offline CPU frequency
 virecover_enable="YES"	# Perform housekeeping for the vi(1) editor
 ugidfw_enable="NO"	# Load mac_bsdextended(4) rules on boot

==== //depot/projects/dtrace/src/sys/kern/vfs_lookup.c#4 (text+ko) ====

@@ -35,7 +35,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.91 2006/04/29 07:13:49 kris Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/vfs_lookup.c,v 1.92 2006/08/05 21:08:47 rwatson Exp $");
 
 #include "opt_ktrace.h"
 #include "opt_mac.h"
@@ -88,7 +88,7 @@
     "Enables/Disables shared locks for path name translation");
 
 /*
- * Convert a pathname into a pointer to a locked inode.
+ * Convert a pathname into a pointer to a locked vnode.
  *
  * The FOLLOW flag is set when symbolic links are to be followed
  * when they occur at the end of the name translation process.
@@ -607,7 +607,7 @@
 		/*
 		 * We return with ni_vp NULL to indicate that the entry
 		 * doesn't currently exist, leaving a pointer to the
-		 * (possibly locked) directory inode in ndp->ni_dvp.
+		 * (possibly locked) directory vnode in ndp->ni_dvp.
 		 */
 		if (cnp->cn_flags & SAVESTART) {
 			ndp->ni_startdir = ndp->ni_dvp;
@@ -859,7 +859,7 @@
 		/*
 		 * We return with ni_vp NULL to indicate that the entry
 		 * doesn't currently exist, leaving a pointer to the
-		 * (possibly locked) directory inode in ndp->ni_dvp.
+		 * (possibly locked) directory vnode in ndp->ni_dvp.
 		 */
 		return (0);
 	}

==== //depot/projects/dtrace/src/sys/sys/param.h#9 (text+ko) ====

@@ -32,7 +32,7 @@
  * SUCH DAMAGE.
  *
  *	@(#)param.h	8.3 (Berkeley) 4/4/95
- * $FreeBSD: src/sys/sys/param.h,v 1.269 2006/07/29 19:44:07 simon Exp $
+ * $FreeBSD: src/sys/sys/param.h,v 1.270 2006/08/05 20:35:11 jb Exp $
  */
 
 #ifndef _SYS_PARAM_H_
@@ -344,7 +344,7 @@
  * FreeBSD headers provide to OpenSolaris code. Perhaps one day there
  * will be a really, really Single Unix Specification.
  */
-#define __OpenSolaris_version 20060508
+#define __OpenSolaris_version 20060731
 #endif
 
 #endif	/* _SYS_PARAM_H_ */