diff options
| author | Roman Zippel <zippel@linux-m68k.org> | 2006-03-26 01:38:08 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-03-26 08:57:02 -0800 |
| commit | 432569bb9d9d424d7ffe5b21f8205c55bdd1aaa8 (patch) | |
| tree | da649d202625d061d4fca27a6a63c4f81076724e /include | |
| parent | 3b98a5328171cebc867f70484b20bd34948cd7f6 (diff) | |
| download | op-kernel-dev-432569bb9d9d424d7ffe5b21f8205c55bdd1aaa8.zip op-kernel-dev-432569bb9d9d424d7ffe5b21f8205c55bdd1aaa8.tar.gz | |
[PATCH] hrtimers: simplify nanosleep
nanosleep is the only user of the expired state, so let it manage this itself,
which makes the hrtimer code a bit simpler. The remaining time is also only
calculated if requested.
Signed-off-by: Roman Zippel <zippel@linux-m68k.org>
Acked-by: Ingo Molnar <mingo@elte.hu>
Acked-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 | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/include/linux/hrtimer.h b/include/linux/hrtimer.h index 84fc186..0e8f476 100644 --- a/include/linux/hrtimer.h +++ b/include/linux/hrtimer.h @@ -38,9 +38,7 @@ enum hrtimer_restart { * Timer states: */ enum hrtimer_state { - HRTIMER_INACTIVE, /* Timer is inactive */ - HRTIMER_EXPIRED, /* Timer is expired */ - HRTIMER_RUNNING, /* Timer is running the callback function */ + HRTIMER_INACTIVE, /* Timer is inactive */ HRTIMER_PENDING, /* Timer is pending */ }; |
