PERFORCE change 137350 for review

[Warner Losh]

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

Change 137350 by imp at imp_paco-paco on 2008/03/10 20:41:22

	IFC @137347

Affected files ...

.. //depot/projects/arm/src/bin/uuidgen/Makefile#1 branch
.. //depot/projects/arm/src/bin/uuidgen/uuidgen.1#1 branch
.. //depot/projects/arm/src/bin/uuidgen/uuidgen.c#1 branch
.. //depot/projects/arm/src/sbin/mount/mount.8#8 integrate
.. //depot/projects/arm/src/sys/dev/vr/if_vr.c#1 branch
.. //depot/projects/arm/src/sys/dev/vr/if_vrreg.h#1 branch
.. //depot/projects/arm/src/sys/security/audit/audit_worker.c#9 integrate
.. //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#23 integrate

Differences ...

==== //depot/projects/arm/src/sbin/mount/mount.8#8 (text+ko) ====

@@ -26,9 +26,9 @@
 .\" SUCH DAMAGE.
 .\"
 .\"     @(#)mount.8	8.8 (Berkeley) 6/16/94
-.\" $FreeBSD: src/sbin/mount/mount.8,v 1.84 2007/11/27 20:37:16 jhb Exp $
+.\" $FreeBSD: src/sbin/mount/mount.8,v 1.85 2008/03/10 19:03:55 tmclaugh Exp $
 .\"
-.Dd July 12, 2006
+.Dd March 10, 2008
 .Dt MOUNT 8
 .Os
 .Sh NAME
@@ -335,7 +335,7 @@
 .Nm
 command:
 .Bd -literal -offset indent
-mount -t unionfs -o -b /sys $HOME/sys
+mount -t unionfs -o below /sys $HOME/sys
 .Ed
 .Pp
 causes

==== //depot/projects/arm/src/sys/security/audit/audit_worker.c#9 (text) ====

@@ -27,7 +27,7 @@
  * IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  *
- * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.21 2008/03/01 11:04:04 rwatson Exp $
+ * $FreeBSD: src/sys/security/audit/audit_worker.c,v 1.22 2008/03/10 18:15:02 rwatson Exp $
  */
 
 #include <sys/param.h>
@@ -170,9 +170,6 @@
 	 * are limited to 1/sec.
 	 */
 	if (audit_qctrl.aq_minfree != 0) {
-		/*
-		 * XXXAUDIT: Check math and block size calculations here.
-		 */
 		temp = mnt_stat->f_blocks / (100 / audit_qctrl.aq_minfree);
 		if (mnt_stat->f_bfree < temp) {
 			if (ppsratecheck(&last_lowspace_trigger,

==== //depot/projects/arm/src/sys/ufs/ffs/ffs_softdep.c#23 (text+ko) ====

@@ -39,7 +39,7 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.217 2008/02/24 16:38:58 attilio Exp $");
+__FBSDID("$FreeBSD: src/sys/ufs/ffs/ffs_softdep.c,v 1.218 2008/03/10 18:44:07 emaste Exp $");
 
 /*
  * For now we want the safety net that the DEBUG flag provides.
@@ -78,7 +78,6 @@
 #include <vm/vm.h>
 
 #include "opt_ffs.h"
-#include "opt_quota.h"
 
 #ifndef SOFTUPDATES