--- zzzz-none-000/linux-2.6.13.1/include/linux/timer.h 2005-09-10 02:42:58.000000000 +0000 +++ ohio-7170-487/linux-2.6.13.1/include/linux/timer.h 2006-12-15 09:14:55.000000000 +0000 @@ -18,19 +18,34 @@ unsigned long data; struct timer_base_s *base; + +#ifdef CONFIG_HIGH_RES_TIMERS + long arch_cycle_expires; +#endif /*--- #ifdef CONFIG_HIGH_RES_TIMERS ---*/ }; #define TIMER_MAGIC 0x4b87ad6e extern struct timer_base_s __init_timer_base; +#ifdef CONFIG_HIGH_RES_TIMERS #define TIMER_INITIALIZER(_function, _expires, _data) { \ .function = (_function), \ .expires = (_expires), \ .data = (_data), \ .base = &__init_timer_base, \ .magic = TIMER_MAGIC, \ + .arch_cycle_expires = 0, \ + } +#else /*--- #ifdef CONFIG_HIGH_RES_TIMERS ---*/ +#define TIMER_INITIALIZER(_function, _expires, _data) { \ + .function = (_function), \ + .expires = (_expires), \ + .data = (_data), \ + .base = &__init_timer_base, \ + .magic = TIMER_MAGIC, \ } +#endif /*--- #else ---*/ /*--- #ifdef CONFIG_HIGH_RES_TIMERS ---*/ void fastcall init_timer(struct timer_list * timer);