Merge "timers: Fix documentation for schedule_timeout() and similar" (443502cc) · Commits · e / devices / android_kernel_sony_msm8998

kernel/time/hrtimer.c

+14 −6

Original line number	Diff line number	Diff line
		@@ -1850,15 +1850,19 @@ schedule_hrtimeout_range_clock(ktime_t *expires, u64 delta,
		* You can set the task state as follows -
		*
		* %TASK_UNINTERRUPTIBLE - at least @timeout time is guaranteed to
		* pass before the routine returns.
		* pass before the routine returns unless the current task is explicitly
		* woken up, (e.g. by wake_up_process()).
		*
		* %TASK_INTERRUPTIBLE - the routine may return early if a signal is
		* delivered to the current task.
		* delivered to the current task or the current task is explicitly woken
		* up.
		*
		* The current task state is guaranteed to be TASK_RUNNING when this
		* routine returns.
		*
		* Returns 0 when the timer has expired otherwise -EINTR
		* Returns 0 when the timer has expired. If the task was woken before the
		* timer expired by a signal (only possible in state TASK_INTERRUPTIBLE) or
		* by an explicit wakeup, it returns -EINTR.
		*/
		int __sched schedule_hrtimeout_range(ktime_t *expires, u64 delta,
		const enum hrtimer_mode mode)
		@@ -1880,15 +1884,19 @@ EXPORT_SYMBOL_GPL(schedule_hrtimeout_range);
		* You can set the task state as follows -
		*
		* %TASK_UNINTERRUPTIBLE - at least @timeout time is guaranteed to
		* pass before the routine returns.
		* pass before the routine returns unless the current task is explicitly
		* woken up, (e.g. by wake_up_process()).
		*
		* %TASK_INTERRUPTIBLE - the routine may return early if a signal is
		* delivered to the current task.
		* delivered to the current task or the current task is explicitly woken
		* up.
		*
		* The current task state is guaranteed to be TASK_RUNNING when this
		* routine returns.
		*
		* Returns 0 when the timer has expired otherwise -EINTR
		* Returns 0 when the timer has expired. If the task was woken before the
		* timer expired by a signal (only possible in state TASK_INTERRUPTIBLE) or
		* by an explicit wakeup, it returns -EINTR.
		*/
		int __sched schedule_hrtimeout(ktime_t *expires,
		const enum hrtimer_mode mode)

kernel/time/timer.c

+7 −4

Original line number	Diff line number	Diff line
		@@ -1536,11 +1536,12 @@ static void process_timeout(unsigned long __data)
		* You can set the task state as follows -
		*
		* %TASK_UNINTERRUPTIBLE - at least @timeout jiffies are guaranteed to
		* pass before the routine returns. The routine will return 0
		* pass before the routine returns unless the current task is explicitly
		* woken up, (e.g. by wake_up_process())".
		*
		* %TASK_INTERRUPTIBLE - the routine may return early if a signal is
		* delivered to the current task. In this case the remaining time
		* in jiffies will be returned, or 0 if the timer expired in time
		* delivered to the current task or the current task is explicitly woken
		* up.
		*
		* The current task state is guaranteed to be TASK_RUNNING when this
		* routine returns.
		@@ -1549,7 +1550,9 @@ static void process_timeout(unsigned long __data)
		* the CPU away without a bound on the timeout. In this case the return
		* value will be %MAX_SCHEDULE_TIMEOUT.
		*
		* In all cases the return value is guaranteed to be non-negative.
		* Returns 0 when the timer has expired otherwise the remaining time in
		* jiffies will be returned. In all cases the return value is guaranteed
		* to be non-negative.
		*/
		signed long __sched schedule_timeout(signed long timeout)
		{