summaryrefslogtreecommitdiffstats
path: root/include/linux/timer.h
diff options
context:
space:
mode:
authorRalf Baechle <ralf@linux-mips.org>1998-04-05 11:23:36 +0000
committerRalf Baechle <ralf@linux-mips.org>1998-04-05 11:23:36 +0000
commit4318fbda2a7ee51caafdc4eb1f8028a3f0605142 (patch)
treecddb50a81d7d1a628cc400519162080c6d87868e /include/linux/timer.h
parent36ea5120664550fae6d31f1c6f695e4f8975cb06 (diff)
o Merge with Linux 2.1.91.
o First round of bugfixes for the SC/MC CPUs. o FPU context switch fixes. o Lazy context switches. o Faster syscalls. o Removed dead code. o Shitloads of other things I forgot ...
Diffstat (limited to 'include/linux/timer.h')
-rw-r--r--include/linux/timer.h9
1 files changed, 8 insertions, 1 deletions
diff --git a/include/linux/timer.h b/include/linux/timer.h
index 7d11fd246..2649014a1 100644
--- a/include/linux/timer.h
+++ b/include/linux/timer.h
@@ -46,7 +46,7 @@ extern struct timer_struct timer_table[32];
* to distinguish between the different invocations.
*/
struct timer_list {
- struct timer_list *next;
+ struct timer_list *next; /* MUST be first element */
struct timer_list *prev;
unsigned long expires;
unsigned long data;
@@ -56,6 +56,13 @@ struct timer_list {
extern void add_timer(struct timer_list * timer);
extern int del_timer(struct timer_list * timer);
+/*
+ * mod_timer is a more efficient way to update the expire field of an
+ * active timer (if the timer is inactive it will be activated)
+ * mod_timer(a,b) is equivalent to del_timer(a); a->expires = b; add_timer(a)
+ */
+void mod_timer(struct timer_list *timer, unsigned long expires);
+
extern void it_real_fn(unsigned long);
extern inline void init_timer(struct timer_list * timer)