diff options
Diffstat (limited to 'drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h')
| -rw-r--r-- | drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h | 24 |
1 files changed, 10 insertions, 14 deletions
diff --git a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h index 9c40ed904da5..e6e417aeefd5 100644 --- a/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h +++ b/drivers/staging/lustre/include/linux/libcfs/libcfs_prim.h @@ -40,10 +40,6 @@ #ifndef __LIBCFS_PRIM_H__ #define __LIBCFS_PRIM_H__ -#ifndef EXPORT_SYMBOL -# define EXPORT_SYMBOL(s) -#endif - /* * Schedule */ @@ -53,20 +49,20 @@ void cfs_pause(cfs_duration_t ticks); * Timer */ typedef void (cfs_timer_func_t)(ulong_ptr_t); -void schedule_timeout_and_set_state(cfs_task_state_t, int64_t); +void schedule_timeout_and_set_state(long, int64_t); void init_waitqueue_entry_current(wait_queue_t *link); -int64_t waitq_timedwait(wait_queue_t *, cfs_task_state_t, int64_t); -void waitq_wait(wait_queue_t *, cfs_task_state_t); +int64_t waitq_timedwait(wait_queue_t *, long, int64_t); +void waitq_wait(wait_queue_t *, long); void add_wait_queue_exclusive_head(wait_queue_head_t *, wait_queue_t *); -void cfs_init_timer(timer_list_t *t); -void cfs_timer_init(timer_list_t *t, cfs_timer_func_t *func, void *arg); -void cfs_timer_done(timer_list_t *t); -void cfs_timer_arm(timer_list_t *t, cfs_time_t deadline); -void cfs_timer_disarm(timer_list_t *t); -int cfs_timer_is_armed(timer_list_t *t); -cfs_time_t cfs_timer_deadline(timer_list_t *t); +void cfs_init_timer(struct timer_list *t); +void cfs_timer_init(struct timer_list *t, cfs_timer_func_t *func, void *arg); +void cfs_timer_done(struct timer_list *t); +void cfs_timer_arm(struct timer_list *t, cfs_time_t deadline); +void cfs_timer_disarm(struct timer_list *t); +int cfs_timer_is_armed(struct timer_list *t); +cfs_time_t cfs_timer_deadline(struct timer_list *t); /* * Memory |