b=14132

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

diff --git a/libcfs/include/libcfs/libcfs_prim.h b/libcfs/include/libcfs/libcfs_prim.h
index c9b5c39..869b12f 100644 (file)
--- a/libcfs/include/libcfs/libcfs_prim.h
+++ b/libcfs/include/libcfs/libcfs_prim.h
@@ -16,8 +16,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
@@ -48,6 +48,8 @@
 void cfs_schedule_timeout(cfs_task_state_t state, int64_t timeout);
 void cfs_schedule(void);
 void cfs_pause(cfs_duration_t ticks);
+int  cfs_need_resched(void);
+void cfs_cond_resched(void);
 
 /*
  * Wait Queues
@@ -55,7 +57,7 @@ void cfs_pause(cfs_duration_t ticks);
 void cfs_waitq_init(cfs_waitq_t *waitq);
 void cfs_waitlink_init(cfs_waitlink_t *link);
 void cfs_waitq_add(cfs_waitq_t *waitq, cfs_waitlink_t *link);
-void cfs_waitq_add_exclusive(cfs_waitq_t *waitq, 
+void cfs_waitq_add_exclusive(cfs_waitq_t *waitq,
                              cfs_waitlink_t *link);
 void cfs_waitq_del(cfs_waitq_t *waitq, cfs_waitlink_t *link);
 int  cfs_waitq_active(cfs_waitq_t *waitq);
@@ -69,7 +71,7 @@ int64_t cfs_waitq_timedwait(cfs_waitlink_t *link, cfs_task_state_t state,
 /*
  * Timer
  */
-typedef  void (cfs_timer_func_t)(unsigned long);
+typedef  void (cfs_timer_func_t)(ulong_ptr_t);
 
 void cfs_init_timer(cfs_timer_t *t);
 void cfs_timer_init(cfs_timer_t *t, cfs_timer_func_t *func, void *arg);