evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "timers: Fix usleep_range() in the context of wake_up_process()"

Browse source
This commit is contained in:
Linux Build Service Account 2017-01-09 12:42:33 -08:00 • committed by Gerrit - the friendly Code Review server
commit 8f67fe8656
1 changed files with 9 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
kernel/time/timer.c
View file

@ -1784,16 +1784,6 @@ unsigned long msleep_interruptible(unsigned int msecs)
EXPORT_SYMBOL(msleep_interruptible); EXPORT_SYMBOL(msleep_interruptible);
static void __sched do_usleep_range(unsigned long min, unsigned long max)
{
ktime_t kmin;
u64 delta;
kmin = ktime_set(0, min * NSEC_PER_USEC);
delta = (u64)(max - min) * NSEC_PER_USEC;
schedule_hrtimeout_range(&kmin, delta, HRTIMER_MODE_REL);
}
/** /**
* usleep_range - Drop in replacement for udelay where wakeup is flexible * usleep_range - Drop in replacement for udelay where wakeup is flexible
* @min: Minimum time in usecs to sleep * @min: Minimum time in usecs to sleep
@ -1801,7 +1791,14 @@ static void __sched do_usleep_range(unsigned long min, unsigned long max)
*/ */
void __sched usleep_range(unsigned long min, unsigned long max) void __sched usleep_range(unsigned long min, unsigned long max)
{ {
__set_current_state(TASK_UNINTERRUPTIBLE); ktime_t exp = ktime_add_us(ktime_get(), min);
do_usleep_range(min, max); u64 delta = (u64)(max - min) * NSEC_PER_USEC;
for (;;) {
__set_current_state(TASK_UNINTERRUPTIBLE);
/* Do not return before the requested sleep time has elapsed */
if (!schedule_hrtimeout_range(&exp, delta, HRTIMER_MODE_ABS))
break;
}
} }
EXPORT_SYMBOL(usleep_range); EXPORT_SYMBOL(usleep_range);