diff options
author | Toyo Abe <toyoa@mvista.com> | 2006-09-29 05:00:28 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-09-29 12:18:15 -0400 |
commit | 1711ef3866b0360e102327389fe4b76c849bbe83 (patch) | |
tree | b74a2cb6167840563d450859a571d6685966b771 /kernel/posix-timers.c | |
parent | 9c4751fd0eab5b8ebbfafb28cbcc8e03b0da5933 (diff) |
[PATCH] posix-timers: Fix clock_nanosleep() doesn't return the remaining time in compatibility mode
The clock_nanosleep() function does not return the time remaining when the
sleep is interrupted by a signal.
This patch creates a new call out, compat_clock_nanosleep_restart(), which
handles returning the remaining time after a sleep is interrupted. This
patch revives clock_nanosleep_restart(). It is now accessed via the new
call out. The compat_clock_nanosleep_restart() is used for compatibility
access.
Since this is implemented in compatibility mode the normal path is
virtually unaffected - no real performance impact.
Signed-off-by: Toyo Abe <toyoa@mvista.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Ingo Molnar <mingo@elte.hu>
Cc: Roland McGrath <roland@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'kernel/posix-timers.c')
-rw-r--r-- | kernel/posix-timers.c | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/kernel/posix-timers.c b/kernel/posix-timers.c index ac6dc874442..e5ebcc1ec3a 100644 --- a/kernel/posix-timers.c +++ b/kernel/posix-timers.c | |||
@@ -973,3 +973,24 @@ sys_clock_nanosleep(const clockid_t which_clock, int flags, | |||
973 | return CLOCK_DISPATCH(which_clock, nsleep, | 973 | return CLOCK_DISPATCH(which_clock, nsleep, |
974 | (which_clock, flags, &t, rmtp)); | 974 | (which_clock, flags, &t, rmtp)); |
975 | } | 975 | } |
976 | |||
977 | /* | ||
978 | * nanosleep_restart for monotonic and realtime clocks | ||
979 | */ | ||
980 | static int common_nsleep_restart(struct restart_block *restart_block) | ||
981 | { | ||
982 | return hrtimer_nanosleep_restart(restart_block); | ||
983 | } | ||
984 | |||
985 | /* | ||
986 | * This will restart clock_nanosleep. This is required only by | ||
987 | * compat_clock_nanosleep_restart for now. | ||
988 | */ | ||
989 | long | ||
990 | clock_nanosleep_restart(struct restart_block *restart_block) | ||
991 | { | ||
992 | clockid_t which_clock = restart_block->arg0; | ||
993 | |||
994 | return CLOCK_DISPATCH(which_clock, nsleep_restart, | ||
995 | (restart_block)); | ||
996 | } | ||