LU-1617 build: skip generated files in .gitignore

[fs/lustre-release.git] / libcfs / include / libcfs / darwin / libcfs.h

diff --git a/libcfs/include/libcfs/darwin/libcfs.h b/libcfs/include/libcfs/darwin/libcfs.h
index e3fdfd2..0e4057d 100644 (file)
--- a/libcfs/include/libcfs/darwin/libcfs.h
+++ b/libcfs/include/libcfs/darwin/libcfs.h
@@ -1,6 +1,4 @@
-/* -*- mode: c; c-basic-offset: 8; indent-tabs-mode: nil; -*-
- * vim:expandtab:shiftwidth=8:tabstop=8:
- *
+/*
  * GPL HEADER START
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
@@ -16,8 +14,8 @@
  * in the LICENSE file that accompanied this code).
  *
  * You should have received a copy of the GNU General Public License
- * version 2 along with this program; If not, see [sun.com URL with a
- * copy of GPLv2].
+ * version 2 along with this program; If not, see
+ * http://www.sun.com/software/products/lustre/docs/GPLv2.pdf
  *
  * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
  * CA 95054 USA or visit www.sun.com if you need additional information or
@@ -26,7 +24,7 @@
  * GPL HEADER END
  */
 /*
- * Copyright  2008 Sun Microsystems, Inc. All rights reserved
+ * Copyright (c) 2008, 2010, Oracle and/or its affiliates. All rights reserved.
  * Use is subject to license terms.
  */
 /*
@@ -97,7 +95,7 @@ typedef unsigned long long cycles_t;
 #endif
 #define LUSTRE_TRACE_SIZE (THREAD_SIZE >> 5)
 
-#define CHECK_STACK() do { } while(0)
+#define CHECK_STACK(msgdata, mask, cdls) do {} while(0)
 #define CDEBUG_STACK() (0L)
 
 /* Darwin has defined RETURN, so we have to undef it in lustre */
@@ -143,26 +141,26 @@ typedef unsigned long long cycles_t;
  * "continously".
  */
 enum {
-       CDD_MAGIC1 = 0x02128506,
-       CDD_MAGIC2 = 0x42424242
+        CDD_MAGIC1 = 0x02128506,
+        CDD_MAGIC2 = 0x42424242
 };
 
 struct cfs_debug_data {
-       unsigned int           magic1;
-       struct cfs_debug_data *parent;
-       int                    nesting_level;
-       unsigned int           magic2;
+        unsigned int           magic1;
+        struct cfs_debug_data *parent;
+        int                    nesting_level;
+        unsigned int           magic2;
 };
 
 void __entry_nesting(struct cfs_debug_data *child);
 void __exit_nesting(struct cfs_debug_data *child);
 unsigned int __current_nesting_level(void);
 
-#define ENTRY_NESTING                                          \
-struct cfs_debug_data __cdd = { .magic1        = CDD_MAGIC1,   \
-                               .parent        = NULL,          \
-                                .nesting_level = 0,            \
-                                .magic2        = CDD_MAGIC2 }; \
+#define ENTRY_NESTING                                           \
+struct cfs_debug_data __cdd = { .magic1        = CDD_MAGIC1,    \
+                                .parent        = NULL,          \
+                                .nesting_level = 0,             \
+                                .magic2        = CDD_MAGIC2 };  \
 __entry_nesting(&__cdd);
 
 #define EXIT_NESTING __exit_nesting(&__cdd)
@@ -190,7 +188,7 @@ __entry_nesting(&__cdd);
 /*
  * XNU has no capabilities
  */
-typedef int cfs_kernel_cap_t;
+typedef __u32 cfs_kernel_cap_t;
 
 #ifdef __KERNEL__
 enum {