diff options
author | Roman Zippel <zippel@linux-m68k.org> | 2006-03-26 04:38:06 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 11:57:02 -0500 |
commit | 44f21475511bbc0135b52c66ad74dcc6a9026da3 (patch) | |
tree | 5cbd605c9d074f40b52a877859957432311b2399 /kernel/itimer.c | |
parent | 92127c7a45d4d167d9b015a5f9de6b41ed66f1d0 (diff) |
[PATCH] hrtimers: pass current time to hrtimer_forward()
Pass current time to hrtimer_forward(). This allows to use the softirq time
in the timer base when the forward function is called from the timer callback.
Other places pass current time with a call to timer->base->get_time().
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/itimer.c')
-rw-r--r-- | kernel/itimer.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/kernel/itimer.c b/kernel/itimer.c index 680e6b70c872..af2ec6b4392c 100644 --- a/kernel/itimer.c +++ b/kernel/itimer.c | |||
@@ -136,7 +136,8 @@ int it_real_fn(void *data) | |||
136 | 136 | ||
137 | if (tsk->signal->it_real_incr.tv64 != 0) { | 137 | if (tsk->signal->it_real_incr.tv64 != 0) { |
138 | hrtimer_forward(&tsk->signal->real_timer, | 138 | hrtimer_forward(&tsk->signal->real_timer, |
139 | tsk->signal->it_real_incr); | 139 | tsk->signal->real_timer.base->softirq_time, |
140 | tsk->signal->it_real_incr); | ||
140 | 141 | ||
141 | return HRTIMER_RESTART; | 142 | return HRTIMER_RESTART; |
142 | } | 143 | } |