svn commit: r188255 - in stable/7/sys: . contrib/pf dev/ath/ath_hal dev/cxgb security/mac

[Robert Watson]

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>