diff options
| author |   Roman Zippel <zippel@linux-m68k.org> | 2006-03-26 01:38:06 -0800 |
|---|---|---|
| committer |   Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 08:57:02 -0800 |
| commit | 44f21475511bbc0135b52c66ad74dcc6a9026da3 (patch) | |
| tree | 5cbd605c9d074f40b52a877859957432311b2399 /include/linux/hrtimer.h | |
| parent | [PATCH] hrtimers: optimize softirq runqueues (diff) | |
| download | linux-dev-44f21475511bbc0135b52c66ad74dcc6a9026da3.tar.xz linux-dev-44f21475511bbc0135b52c66ad74dcc6a9026da3.zip | |
[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 'include/linux/hrtimer.h')
| -rw-r--r-- | include/linux/hrtimer.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 64e2754ca734..84fc186324e6 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -130,7 +130,8 @@ static inline int hrtimer_active(const struct hrtimer *timer) } /* Forward a hrtimer so it expires after now: */ -extern unsigned long hrtimer_forward(struct hrtimer *timer, ktime_t interval); +extern unsigned long +hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval); /* Precise sleep: */ extern long hrtimer_nanosleep(struct timespec *rqtp, |