aboutsummaryrefslogtreecommitdiffstats
path: root/include/linux
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2006-01-09 23:52:37 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2006-01-10 11:01:38 -0500
commit97735f25d2ba898ec5e13746451525580631c834 (patch)
treea6da1078f04bec45967bd83f340b6f7bde731f5d /include/linux
parent6ba1b91213e81aa92b5cf7539f7d2a94ff54947c (diff)
[PATCH] hrtimer: switch clock_nanosleep to hrtimer nanosleep API
Switch clock_nanosleep to use the new nanosleep functions in hrtimer.c Signed-off-by: Thomas Gleixner <tglx@linutronix.de> Signed-off-by: Ingo Molnar <mingo@elte.hu> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include/linux')
-rw-r--r--include/linux/posix-timers.h7
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h
index ae51473d3d48..3c0a5beb7f0d 100644
--- a/include/linux/posix-timers.h
+++ b/include/linux/posix-timers.h
@@ -81,7 +81,7 @@ struct k_clock {
81 int (*clock_get) (const clockid_t which_clock, struct timespec * tp); 81 int (*clock_get) (const clockid_t which_clock, struct timespec * tp);
82 int (*timer_create) (struct k_itimer *timer); 82 int (*timer_create) (struct k_itimer *timer);
83 int (*nsleep) (const clockid_t which_clock, int flags, 83 int (*nsleep) (const clockid_t which_clock, int flags,
84 struct timespec *); 84 struct timespec *, struct timespec __user *);
85 int (*timer_set) (struct k_itimer * timr, int flags, 85 int (*timer_set) (struct k_itimer * timr, int flags,
86 struct itimerspec * new_setting, 86 struct itimerspec * new_setting,
87 struct itimerspec * old_setting); 87 struct itimerspec * old_setting);
@@ -95,7 +95,8 @@ void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock);
95 95
96/* error handlers for timer_create, nanosleep and settime */ 96/* error handlers for timer_create, nanosleep and settime */
97int do_posix_clock_notimer_create(struct k_itimer *timer); 97int do_posix_clock_notimer_create(struct k_itimer *timer);
98int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *); 98int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *,
99 struct timespec __user *);
99int do_posix_clock_nosettime(const clockid_t, struct timespec *tp); 100int do_posix_clock_nosettime(const clockid_t, struct timespec *tp);
100 101
101/* function to call to trigger timer event */ 102/* function to call to trigger timer event */
@@ -129,7 +130,7 @@ int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *ts);
129int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *ts); 130int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *ts);
130int posix_cpu_timer_create(struct k_itimer *timer); 131int posix_cpu_timer_create(struct k_itimer *timer);
131int posix_cpu_nsleep(const clockid_t which_clock, int flags, 132int posix_cpu_nsleep(const clockid_t which_clock, int flags,
132 struct timespec *ts); 133 struct timespec *rqtp, struct timespec __user *rmtp);
133int posix_cpu_timer_set(struct k_itimer *timer, int flags, 134int posix_cpu_timer_set(struct k_itimer *timer, int flags,
134 struct itimerspec *new, struct itimerspec *old); 135 struct itimerspec *new, struct itimerspec *old);
135int posix_cpu_timer_del(struct k_itimer *timer); 136int posix_cpu_timer_del(struct k_itimer *timer);