From owner-svn-src-stable-7@FreeBSD.ORG  Sat Feb  7 00:05:10 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D610E1065677;
	Sat,  7 Feb 2009 00:05:10 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id C1A5F8FC22;
	Sat,  7 Feb 2009 00:05:10 +0000 (UTC)
	(envelope-from rwatson@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n1705AWW075090;
	Sat, 7 Feb 2009 00:05:10 GMT (envelope-from rwatson@svn.freebsd.org)
Received: (from rwatson@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n1705Abs075088;
	Sat, 7 Feb 2009 00:05:10 GMT (envelope-from rwatson@svn.freebsd.org)
Message-Id: <200902070005.n1705Abs075088@svn.freebsd.org>
From: Robert Watson <rwatson@FreeBSD.org>
Date: Sat, 7 Feb 2009 00:05:10 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r188255 - in stable/7/sys: . contrib/pf dev/ath/ath_hal
	dev/cxgb security/mac
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Sat, 07 Feb 2009 00:05:11 -0000

Author: rwatson
Date: Sat Feb  7 00:05:10 2009
New Revision: 188255
URL: http://svn.freebsd.org/changeset/base/188255

Log:
  Merge r187667 from head to stable/7:
  
    Use __FBSDID() for $FreeBSD$ version strings in .c files.
  
    Obtained from:        TrustedBSD Project

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)
  stable/7/sys/security/mac/mac_audit.c
  stable/7/sys/security/mac/mac_priv.c

Modified: stable/7/sys/security/mac/mac_audit.c
==============================================================================
--- stable/7/sys/security/mac/mac_audit.c	Sat Feb  7 00:01:10 2009	(r188254)
+++ stable/7/sys/security/mac/mac_audit.c	Sat Feb  7 00:05:10 2009	(r188255)
@@ -31,10 +31,11 @@
  * LIABILITY, OR TORT (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$
  */
 
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
 #include <sys/param.h>
 #include <sys/module.h>
 #include <sys/vnode.h>

Modified: stable/7/sys/security/mac/mac_priv.c
==============================================================================
--- stable/7/sys/security/mac/mac_priv.c	Sat Feb  7 00:01:10 2009	(r188254)
+++ stable/7/sys/security/mac/mac_priv.c	Sat Feb  7 00:05:10 2009	(r188255)
@@ -25,14 +25,15 @@
  * LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (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$
  */
 
 /*
  * MAC checks for system privileges.
  */
 
+#include "sys/cdefs.h"
+__FBSDID("$FreeBSD$");
+
 #include "opt_mac.h"
 
 #include <sys/param.h>