[PATCH] introduce setup_timer() helper

[safe/jmp/linux-2.6] / kernel / timer.c

diff --git a/kernel/timer.c b/kernel/timer.c
index 6a2e5f8..6ed1a82 100644 (file)
--- a/kernel/timer.c
+++ b/kernel/timer.c
@@ -1146,12 +1146,8 @@ fastcall signed long __sched schedule_timeout(signed long timeout)
 
        expire = timeout + jiffies;
 
-       init_timer(&timer);
-       timer.expires = expire;
-       timer.data = (unsigned long) current;
-       timer.function = process_timeout;
-
-       add_timer(&timer);
+       setup_timer(&timer, process_timeout, (unsigned long)current);
+       __mod_timer(&timer, expire);
        schedule();
        del_singleshot_timer_sync(&timer);