xnu-1228.tar.gz

[apple/xnu.git] / bsd / sys / trace.h

diff --git a/bsd/sys/trace.h b/bsd/sys/trace.h
index 6ae28ba2c155bf608cbbf45122614c2e7e717264..75ec17900471e82450101e25f557ca0146153f9f 100644 (file)
--- a/bsd/sys/trace.h
+++ b/bsd/sys/trace.h
@@ -1,16 +1,19 @@
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *
 /*
  * Copyright (c) 2000-2002 Apple Computer, Inc. All rights reserved.
  *

- * @APPLE_LICENSE_HEADER_START@
- * 
- * Copyright (c) 1999-2003 Apple Computer, Inc.  All Rights Reserved.
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_START@

  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in
  * 
  * This file contains Original Code and/or Modifications of Original Code
  * as defined in and that are subject to the Apple Public Source License
  * Version 2.0 (the 'License'). You may not use this file except in

- * compliance with the License. Please obtain a copy of the License at
- * http://www.opensource.apple.com/apsl/ and read it before using this
- * file.
+ * compliance with the License. The rights granted to you under the License
+ * may not be used to create, or enable the creation or redistribution of,
+ * unlawful or unlicensed copies of an Apple operating system, or to
+ * circumvent, violate, or enable the circumvention or violation of, any
+ * terms of an Apple operating system software license agreement.
+ * 
+ * Please obtain a copy of the License at
+ * http://www.opensource.apple.com/apsl/ and read it before using this file.

  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER
  * 
  * The Original Code and all software distributed under the License are
  * distributed on an 'AS IS' basis, WITHOUT WARRANTY OF ANY KIND, EITHER


@@ -20,7 +23,7 @@
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 
  * Please see the License for the specific language governing rights and
  * limitations under the License.
  * 

- * @APPLE_LICENSE_HEADER_END@
+ * @APPLE_OSREFERENCE_LICENSE_HEADER_END@

  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*-
  */
 /* Copyright (c) 1995 NeXT Computer, Inc. All Rights Reserved */
 /*-


@@ -136,7 +139,7 @@ extern struct       proc *traceproc;
 extern int     tracewhich, tracebuf[TRCSIZ];
 extern u_int   tracex;
 extern char    traceflags[TR_NFLAGS];
 extern int     tracewhich, tracebuf[TRCSIZ];
 extern u_int   tracex;
 extern char    traceflags[TR_NFLAGS];

-#define        pack(v,b)       (((v)->v_mount->mnt_stat.f_fsid.val[0])<<16)|(b)
+#define        pack(v,b)       (((v)->v_mount->mnt_vfsstat.f_fsid.val[0])<<16)|(b)

 #define        trace(a,b,c) {                                                  \
        if (traceflags[a])                                              \
                trace1(a,b,c);                                          \
 #define        trace(a,b,c) {                                                  \
        if (traceflags[a])                                              \
                trace1(a,b,c);                                          \