aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux/hrtimer.h
diff options
context:
space:
mode:
authorRoman Zippel <zippel@linux-m68k.org>2006-03-26 04:38:06 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-03-26 11:57:02 -0500
commit44f21475511bbc0135b52c66ad74dcc6a9026da3 (patch)
tree5cbd605c9d074f40b52a877859957432311b2399 /include/linux/hrtimer.h
parent92127c7a45d4d167d9b015a5f9de6b41ed66f1d0 (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 'include/linux/hrtimer.h')
-rw-r--r--include/linux/hrtimer.h3
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)
130} 130}
131 131
132/* Forward a hrtimer so it expires after now: */ 132/* Forward a hrtimer so it expires after now: */
133extern unsigned long hrtimer_forward(struct hrtimer *timer, ktime_t interval); 133extern unsigned long
134hrtimer_forward(struct hrtimer *timer, ktime_t now, ktime_t interval);
134 135
135/* Precise sleep: */ 136/* Precise sleep: */
136extern long hrtimer_nanosleep(struct timespec *rqtp, 137extern long hrtimer_nanosleep(struct timespec *rqtp,