Subversion Repositories shark

Compare Revisions

Ignore whitespace Rev 493 → Rev 494

/shark/trunk/drivers/linuxc26/include/linux/timer.h
18,6 → 18,9
unsigned long data;
 
struct tvec_t_base_s *base;
 
/* Added by Nino */
int event_timer;
};
 
#define TIMER_MAGIC 0x4b87ad6e
38,12 → 41,13
* init_timer() must be done to a timer prior calling *any* of the
* other timer functions.
*/
static inline void init_timer(struct timer_list * timer)
/*static inline void init_timer(struct timer_list * timer)
{
timer->base = NULL;
timer->magic = TIMER_MAGIC;
spin_lock_init(&timer->lock);
}
}*/
extern void init_timer(struct timer_list * timer);
 
/***
* timer_pending - is a timer pending?
55,10 → 59,11
*
* return value: 1 if the timer is pending, 0 if not.
*/
static inline int timer_pending(const struct timer_list * timer)
/*static inline int timer_pending(const struct timer_list * timer)
{
return timer->base != NULL;
}
}*/
extern int timer_pending(struct timer_list * timer);
 
extern void add_timer_on(struct timer_list *timer, int cpu);
extern int del_timer(struct timer_list * timer);
79,10 → 84,11
* Timers with an ->expired field in the past will be executed in the next
* timer tick.
*/
static inline void add_timer(struct timer_list * timer)
/*static inline void add_timer(struct timer_list * timer)
{
__mod_timer(timer, timer->expires);
}
}*/
extern void add_timer(struct timer_list * timer);
 
#ifdef CONFIG_SMP
extern int del_timer_sync(struct timer_list * timer);