posix-timers: use schedule_timeout() in common_nsleep()
PATCH 1/1 posix-timers: use schedule_timeout() in common_nsleep()
common_nsleep() reimplements schedule_timeout_interruptible() for unknown reason.
Signed-off-by Oleg Nesterov <[email protected]>
kernel/posix-timers.c renamed from kernel/posix-timers.c~4_SCTO +1 -18
@@ -1317,13 +1317,6 @@ sys_clock_getres(clockid_t which_clock,return error; } -static void nanosleep_wake_up (unsigned long __data) -{ -struct task_struct *p = (struct task_struct *) __data; - -wake_up_process (p); -} -/* * The standard says that an absolute nanosleep call MUST wake up at * the requested time in spite of clock settings. Here is what we do:
@@ -1464,7 +1457,6 @@ static int common_nsleep(clockid_t which int flags, struct timespec *tsave) { struct timespec t, dum; -struct timer_list new_timer;DECLARE_WAITQUEUE (abs_wqueue, current);u64 rq_time = (u64 )0 ;s64 left;
@@ -1473,10 +1465,6 @@ static int common_nsleep(clockid_t which ¤t_thread_info ()->restart_block; abs_wqueue.flags =0 ; -init_timer (&new_timer); - new_timer.expires =0 ; - new_timer.data = (unsigned long ) current; - new_timer.function = nanosleep_wake_up; abs = flags &TIMER_ABSTIME ;if (restart_block->fn == clock_nanosleep_restart) {
@@ -1512,13 +1500,8 @@ static int common_nsleep(clockid_t whichif (left < (s64 )0 )break ; - new_timer.expires = jiffies + left; -__set_current_state (TASK_INTERRUPTIBLE ); -add_timer (&new_timer); - -schedule (); +schedule_timeout_interruptible (left); -del_timer_sync (&new_timer); left = rq_time -get_jiffies_64 (); }while (left > (s64 )0 && !test_thread_flag (TIF_SIGPENDING ));