From owner-p4-projects@FreeBSD.ORG  Mon Feb  6 22:09:19 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id D889416A420; Mon,  6 Feb 2006 22:09:18 +0000 (GMT)
X-Original-To: perforce@freebsd.org
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 89E0916A420
	for <perforce@freebsd.org>; Mon,  6 Feb 2006 22:09:18 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 548F143D4C
	for <perforce@freebsd.org>; Mon,  6 Feb 2006 22:09:18 +0000 (GMT)
	(envelope-from jhb@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k16M9IUa005093
	for <perforce@freebsd.org>; Mon, 6 Feb 2006 22:09:18 GMT
	(envelope-from jhb@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k16M9IFt005087
	for perforce@freebsd.org; Mon, 6 Feb 2006 22:09:18 GMT
	(envelope-from jhb@freebsd.org)
Date: Mon, 6 Feb 2006 22:09:18 GMT
Message-Id: <200602062209.k16M9IFt005087@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	jhb@freebsd.org using -f
From: John Baldwin <jhb@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 91271 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
	<mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 06 Feb 2006 22:09:20 -0000

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

Change 91271 by jhb@jhb_slimer on 2006/02/06 22:08:36

	Sync this file with HEAD.

Affected files ...

.. //depot/projects/smpng/sys/kern/kern_acct.c#39 integrate

Differences ...

==== //depot/projects/smpng/sys/kern/kern_acct.c#39 (text+ko) ====

@@ -42,29 +42,29 @@
  */
 
 #include <sys/cdefs.h>
-__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.76 2005/11/12 10:45:13 rwatson Exp $");
+__FBSDID("$FreeBSD: src/sys/kern/kern_acct.c,v 1.78 2006/02/03 16:37:55 jhb Exp $");
 
 #include "opt_mac.h"
 
 #include <sys/param.h>
 #include <sys/systm.h>
+#include <sys/acct.h>
+#include <sys/fcntl.h>
+#include <sys/kernel.h>
 #include <sys/lock.h>
+#include <sys/mac.h>
+#include <sys/mount.h>
 #include <sys/mutex.h>
-#include <sys/sysproto.h>
+#include <sys/namei.h>
 #include <sys/proc.h>
-#include <sys/mac.h>
-#include <sys/mount.h>
-#include <sys/vnode.h>
-#include <sys/fcntl.h>
-#include <sys/syslog.h>
-#include <sys/kernel.h>
+#include <sys/resourcevar.h>
 #include <sys/sx.h>
+#include <sys/sysctl.h>
 #include <sys/sysent.h>
-#include <sys/sysctl.h>
-#include <sys/namei.h>
-#include <sys/acct.h>
-#include <sys/resourcevar.h>
+#include <sys/syslog.h>
+#include <sys/sysproto.h>
 #include <sys/tty.h>
+#include <sys/vnode.h>
 
 /*
  * The routines implemented in this file are described in:
@@ -143,7 +143,7 @@
 	 * appending and make sure it's a 'normal'.  While we could
 	 * conditionally acquire Giant here, we're actually interacting with
 	 * vnodes from possibly two file systems, making the logic a bit
-	 * complicated.  For now, use Giant unconditionally. 
+	 * complicated.  For now, use Giant unconditionally.
 	 */
 	mtx_lock(&Giant);
 	if (uap->path != NULL) {