LU-2800 autoconf: remove obsolete autoconf options

[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 940bf48..2b71184 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,9 +42,6 @@
 
 #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)
 
@@ -58,7 +53,6 @@ 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)
 
@@ -92,6 +86,14 @@ 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)
+#else
+#define cfs_get_cpu() get_cpu()
+#define cfs_put_cpu() put_cpu()
+#endif
+
 #endif /* End of !__KERNEL__ */
 
 /******************************************************************************/
@@ -145,8 +147,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