diff options
Diffstat (limited to 'kernel/time/timer.c')
| -rw-r--r-- | kernel/time/timer.c | 27 |
1 files changed, 24 insertions, 3 deletions
diff --git a/kernel/time/timer.c b/kernel/time/timer.c index aca5dfe2fa3d..e81a30181e41 100644 --- a/kernel/time/timer.c +++ b/kernel/time/timer.c @@ -1432,7 +1432,7 @@ static void process_timeout(unsigned long __data) } /** - * schedule_timeout - sleep until timeout + * __schedule_timeout - sleep until timeout * @timeout: timeout value in jiffies * * Make the current task sleep until @timeout jiffies have @@ -1457,7 +1457,8 @@ static void process_timeout(unsigned long __data) * * In all cases the return value is guaranteed to be non-negative. */ -signed long __sched schedule_timeout(signed long timeout) +static signed long +__sched __schedule_timeout(signed long timeout, unsigned long flag) { struct timer_list timer; unsigned long expire; @@ -1493,7 +1494,13 @@ signed long __sched schedule_timeout(signed long timeout) expire = timeout + jiffies; - setup_timer_on_stack(&timer, process_timeout, (unsigned long)current); + if (flag & TIMER_DEFERRABLE) + setup_deferrable_timer_on_stack(&timer, process_timeout, + (unsigned long)current); + else + setup_timer_on_stack(&timer, process_timeout, + (unsigned long)current); + __mod_timer(&timer, expire, false, TIMER_NOT_PINNED); schedule(); del_singleshot_timer_sync(&timer); @@ -1506,12 +1513,26 @@ signed long __sched schedule_timeout(signed long timeout) out: return timeout < 0 ? 0 : timeout; } + +signed long __sched schedule_timeout(signed long timeout) +{ + return __schedule_timeout(timeout, 0); +} EXPORT_SYMBOL(schedule_timeout); /* * We can use __set_current_state() here because schedule_timeout() calls * schedule() unconditionally. */ + +signed long +__sched schedule_timeout_deferrable_interruptible(signed long timeout) +{ + __set_current_state(TASK_INTERRUPTIBLE); + return __schedule_timeout(timeout, TIMER_DEFERRABLE); +} +EXPORT_SYMBOL(schedule_timeout_deferrable_interruptible); + signed long __sched schedule_timeout_interruptible(signed long timeout) { __set_current_state(TASK_INTERRUPTIBLE); |