diff options
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/timer.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h index fbb80e0030bf..064ee24d3f38 100644 --- a/include/linux/timer.h +++ b/include/linux/timer.h | |||
| @@ -14,7 +14,7 @@ struct timer_list { | |||
| 14 | * All fields that change during normal runtime grouped to the | 14 | * All fields that change during normal runtime grouped to the |
| 15 | * same cacheline | 15 | * same cacheline |
| 16 | */ | 16 | */ |
| 17 | struct list_head entry; | 17 | struct hlist_node entry; |
| 18 | unsigned long expires; | 18 | unsigned long expires; |
| 19 | struct tvec_base *base; | 19 | struct tvec_base *base; |
| 20 | 20 | ||
| @@ -71,7 +71,7 @@ extern struct tvec_base boot_tvec_bases; | |||
| 71 | #define TIMER_FLAG_MASK 0x3LU | 71 | #define TIMER_FLAG_MASK 0x3LU |
| 72 | 72 | ||
| 73 | #define __TIMER_INITIALIZER(_function, _expires, _data, _flags) { \ | 73 | #define __TIMER_INITIALIZER(_function, _expires, _data, _flags) { \ |
| 74 | .entry = { .prev = TIMER_ENTRY_STATIC }, \ | 74 | .entry = { .next = TIMER_ENTRY_STATIC }, \ |
| 75 | .function = (_function), \ | 75 | .function = (_function), \ |
| 76 | .expires = (_expires), \ | 76 | .expires = (_expires), \ |
| 77 | .data = (_data), \ | 77 | .data = (_data), \ |
| @@ -168,7 +168,7 @@ static inline void init_timer_on_stack_key(struct timer_list *timer, | |||
| 168 | */ | 168 | */ |
| 169 | static inline int timer_pending(const struct timer_list * timer) | 169 | static inline int timer_pending(const struct timer_list * timer) |
| 170 | { | 170 | { |
| 171 | return timer->entry.next != NULL; | 171 | return timer->entry.pprev != NULL; |
| 172 | } | 172 | } |
| 173 | 173 | ||
| 174 | extern void add_timer_on(struct timer_list *timer, int cpu); | 174 | extern void add_timer_on(struct timer_list *timer, int cpu); |
