Update copyrights on source files changed since 2010-02-15.

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

diff --git a/libcfs/include/libcfs/darwin/kp30.h b/libcfs/include/libcfs/darwin/kp30.h
index f5e5619..7dc581e 100644 (file)
--- a/libcfs/include/libcfs/darwin/kp30.h
+++ b/libcfs/include/libcfs/darwin/kp30.h
@@ -26,7 +26,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.
  */
 /*
@@ -53,8 +53,6 @@
 #include <libcfs/darwin/darwin-prim.h>
 #include <lnet/lnet.h>
 
-#define our_cond_resched() cfs_schedule_timeout(CFS_TASK_INTERRUPTIBLE, 1)
-
 #ifdef CONFIG_SMP
 #define LASSERT_SPIN_LOCKED(lock) do {} while(0) /* XXX */
 #else
@@ -121,10 +119,20 @@ typedef struct {
 #define LPU64 "%llu"
 #define LPD64 "%lld"
 #define LPX64 "%#llx"
-#define LPSZ  "%lu"
-#define LPSSZ "%ld"
 # define LI_POISON ((int)0x5a5a5a5a)
 # define LL_POISON ((long)0x5a5a5a5a)
 # define LP_POISON ((void *)(long)0x5a5a5a5a)
 
+/*
+ * long_ptr_t & ulong_ptr_t, same to "long" for gcc
+ */
+# define LPLU "%lu"
+# define LPLD "%ld"
+# define LPLX "%#lx"
+
+/*
+ * pid_t
+ */
+# define LPPID "%d"
+
 #endif