diff options
author | Oleg Nesterov <oleg@tv-sign.ru> | 2005-10-30 18:01:38 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2005-10-30 20:37:17 -0500 |
commit | a8db2db1e6a8d323d87a67c5391d48fe2b97faf5 (patch) | |
tree | 0aa5fb9f80e4a476e097337104a3e1f94f39a96e /kernel/timer.c | |
parent | 9e4e23bccb127fac109e765dfb7f9372661cb415 (diff) |
[PATCH] introduce setup_timer() helper
Every user of init_timer() also needs to initialize ->function and ->data
fields. This patch adds a simple setup_timer() helper for that.
The schedule_timeout() is patched as an example of usage.
Signed-off-by: Oleg Nesterov <oleg@tv-sign.ru>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/timer.c')
-rw-r--r-- | kernel/timer.c | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/kernel/timer.c b/kernel/timer.c index 6a2e5f8dc725..6ed1a826e5ce 100644 --- a/kernel/timer.c +++ b/kernel/timer.c | |||
@@ -1146,12 +1146,8 @@ fastcall signed long __sched schedule_timeout(signed long timeout) | |||
1146 | 1146 | ||
1147 | expire = timeout + jiffies; | 1147 | expire = timeout + jiffies; |
1148 | 1148 | ||
1149 | init_timer(&timer); | 1149 | setup_timer(&timer, process_timeout, (unsigned long)current); |
1150 | timer.expires = expire; | 1150 | __mod_timer(&timer, expire); |
1151 | timer.data = (unsigned long) current; | ||
1152 | timer.function = process_timeout; | ||
1153 | |||
1154 | add_timer(&timer); | ||
1155 | schedule(); | 1151 | schedule(); |
1156 | del_singleshot_timer_sync(&timer); | 1152 | del_singleshot_timer_sync(&timer); |
1157 | 1153 | ||