LU-5427 lbuild: Fix compilation with MPSS 3.3

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

diff --git a/libcfs/include/libcfs/winnt/kp30.h b/libcfs/include/libcfs/winnt/kp30.h
index f2293ab..1f3095b 100644 (file)
--- a/libcfs/include/libcfs/winnt/kp30.h
+++ b/libcfs/include/libcfs/winnt/kp30.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.
@@ -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.
  */
 /*
@@ -44,21 +42,15 @@
 
 #define CFS_SYSFS_MODULE_PARM    0 /* no sysfs access to module parameters */
 
-#define cond_resched our_cond_resched
-void our_cond_resched();
-
-#define LASSERT_SPIN_LOCKED(lock) do {} while(0)
-#define LASSERT_SEM_LOCKED(sem) LASSERT(down_trylock(sem) != 0)
 
 /* winnt panic */
 void libcfs_panic(char *msg);
-#define LIBCFS_PANIC(msg) libcfs_panic(msg)
+#define panic(msg) libcfs_panic(msg)
 void libcfs_register_panic_notifier();
 void libcfs_unregister_panic_notifier();
 
 
 #define cfs_work_struct_t WORK_QUEUE_ITEM
-#define cfs_prepare_work(tq, routine, contex)
 #define cfs_schedule_work(tq)
 #define cfs_get_work_data(type,field,data)   (data)
 
@@ -67,11 +59,11 @@ void libcfs_unregister_panic_notifier();
 #define PORTAL_SYMBOL_REGISTER(x)               cfs_symbol_register(#x, &x)
 #define PORTAL_SYMBOL_UNREGISTER(x)             cfs_symbol_unregister(#x)
 
-#define PORTAL_SYMBOL_GET(x)                    (cfs_symbol_get(#x))
-#define PORTAL_SYMBOL_PUT(x)                    cfs_symbol_put(#x)
+#define symbol_get(x)                    (cfs_symbol_get(#x))
+#define symbol_put(x)                    cfs_symbol_put(#x)
 
-#define PORTAL_MODULE_USE                       do{}while(0)
-#define PORTAL_MODULE_UNUSE                     do{}while(0)
+#define try_module_get(THIS_MODULE)                       do{}while(0)
+#define module_put(THIS_MODULE)                     do{}while(0)
 
 #define printk                                  DbgPrint
 #define ptintf                                  DbgPrint
@@ -93,40 +85,13 @@ void libcfs_unregister_panic_notifier();
 #define cfs_assert     _ASSERT
 
 #ifndef get_cpu
-#define cfs_get_cpu() smp_processor_id()
-#define cfs_put_cpu() do { } while (0)
+#define get_cpu() smp_processor_id()
+#define put_cpu() do { } while (0)
 #else
-#define cfs_get_cpu() get_cpu()
-#define cfs_put_cpu() put_cpu()
 #endif
 
 #endif /* End of !__KERNEL__ */
 
-/******************************************************************************/
-/* Light-weight trace
- * Support for temporary event tracing with minimal Heisenberg effect. */
-#define LWT_SUPPORT  0
-
-/* kernel hasn't defined this? */
-typedef struct {
-        __s64      lwte_when;
-        char       *lwte_where;
-        void       *lwte_task;
-        long_ptr_t        lwte_p1;
-        long_ptr_t        lwte_p2;
-        long_ptr_t        lwte_p3;
-        long_ptr_t        lwte_p4;
-# if BITS_PER_LONG > 32
-        long_ptr_t        lwte_pad;
-# endif
-} lwt_event_t;
-
-
-# define LWT_EVENT(p1,p2,p3,p4)
-
-
-/* ------------------------------------------------------------------ */
-
 #define IOCTL_LIBCFS_TYPE long_ptr_t
 
 #ifdef __CYGWIN__
@@ -153,8 +118,7 @@ typedef struct {
 #define LPU64 "%I64u"
 #define LPD64 "%I64d"
 #define LPX64 "%#I64x"
-#define LPSZ  "%lu"
-#define LPSSZ "%ld"
+#define LPO64 "%#I64o"
 
 /*
  * long_ptr_t & ulong_ptr_t, same to "long" for linux