diff options
| author | George Anzinger <george@wildturkeyranch.net> | 2006-02-01 12:05:11 +0100 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-02-01 17:53:13 +0100 |
| commit | 7978672c4d9a1e6a6081de3a9d9ba5e5b24904a0 (patch) | |
| tree | a7deb3a6e339e691078c770d4b9cbc05d99a2243 /include | |
| parent | [PATCH] hrtimers: fix posix-timer requeue race (diff) | |
| download | linux-7978672c4d9a1e6a6081de3a9d9ba5e5b24904a0.tar.xz linux-7978672c4d9a1e6a6081de3a9d9ba5e5b24904a0.zip | |
[PATCH] hrtimers: cleanups and simplifications
Clean up the interface to hrtimers by changing the init code to pass the mode
as well as the clock. This allow the init code to select the correct base and
eliminates extra timer re-init code in posix-timers. We also simplify the
restart interface nanosleep use.
Signed-off-by: George Anzinger <george@mvista.com>
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')
| -rw-r--r-- | include/linux/hrtimer.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index c657f3d4924a..6361544bb6ae 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -101,9 +101,8 @@ struct hrtimer_base { /* Exported timer functions: */ /* Initialize timers: */ -extern void hrtimer_init(struct hrtimer *timer, const clockid_t which_clock); -extern void hrtimer_rebase(struct hrtimer *timer, const clockid_t which_clock); - +extern void hrtimer_init(struct hrtimer *timer, clockid_t which_clock, + enum hrtimer_mode mode); /* Basic timer operations: */ extern int hrtimer_start(struct hrtimer *timer, ktime_t tim, |