diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2006-01-09 20:52:37 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-10 08:01:38 -0800 |
| commit | 97735f25d2ba898ec5e13746451525580631c834 (patch) | |
| tree | a6da1078f04bec45967bd83f340b6f7bde731f5d /include/linux | |
| parent | 6ba1b91213e81aa92b5cf7539f7d2a94ff54947c (diff) | |
| download | kernel-crypto-97735f25d2ba898ec5e13746451525580631c834.tar.gz kernel-crypto-97735f25d2ba898ec5e13746451525580631c834.tar.xz kernel-crypto-97735f25d2ba898ec5e13746451525580631c834.zip | |
[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.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/include/linux/posix-timers.h b/include/linux/posix-timers.h index ae51473d3d4..3c0a5beb7f0 100644 --- a/include/linux/posix-timers.h +++ b/include/linux/posix-timers.h @@ -81,7 +81,7 @@ struct k_clock { int (*clock_get) (const clockid_t which_clock, struct timespec * tp); int (*timer_create) (struct k_itimer *timer); int (*nsleep) (const clockid_t which_clock, int flags, - struct timespec *); + struct timespec *, struct timespec __user *); int (*timer_set) (struct k_itimer * timr, int flags, struct itimerspec * new_setting, struct itimerspec * old_setting); @@ -95,7 +95,8 @@ void register_posix_clock(const clockid_t clock_id, struct k_clock *new_clock); /* error handlers for timer_create, nanosleep and settime */ int do_posix_clock_notimer_create(struct k_itimer *timer); -int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *); +int do_posix_clock_nonanosleep(const clockid_t, int flags, struct timespec *, + struct timespec __user *); int do_posix_clock_nosettime(const clockid_t, struct timespec *tp); /* function to call to trigger timer event */ @@ -129,7 +130,7 @@ int posix_cpu_clock_get(const clockid_t which_clock, struct timespec *ts); int posix_cpu_clock_set(const clockid_t which_clock, const struct timespec *ts); int posix_cpu_timer_create(struct k_itimer *timer); int posix_cpu_nsleep(const clockid_t which_clock, int flags, - struct timespec *ts); + struct timespec *rqtp, struct timespec __user *rmtp); int posix_cpu_timer_set(struct k_itimer *timer, int flags, struct itimerspec *new, struct itimerspec *old); int posix_cpu_timer_del(struct k_itimer *timer); |