X-Git-Url: https://git.whamcloud.com/?a=blobdiff_plain;f=libcfs%2Finclude%2Flibcfs%2Fwinnt%2Fkp30.h;h=1f3095b3b0c615758dbbf55ae1d1e8a5430db4a3;hb=dbd8f93ccc78204fc5394148d4b6a313332b9594;hp=2b711843829ca725579809c679093913b230ffa3;hpb=0aec97df129d2c6263c66454ee9039cd5dbfdf85;p=fs%2Flustre-release.git

diff --git a/libcfs/include/libcfs/winnt/kp30.h b/libcfs/include/libcfs/winnt/kp30.h
index 2b71184..1f3095b 100644
--- a/libcfs/include/libcfs/winnt/kp30.h
+++ b/libcfs/include/libcfs/winnt/kp30.h
@@ -42,12 +42,10 @@
 
 #define CFS_SYSFS_MODULE_PARM    0 /* no sysfs access to module parameters */
 
-#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();
 
@@ -61,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
@@ -87,40 +85,13 @@ void libcfs_unregister_panic_notifier();
 #define cfs_assert     _ASSERT
 
 #ifndef get_cpu
-#define cfs_get_cpu() cfs_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__