xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

posix-timers: Unify overrun/requeue_pending handling

Browse Source 
hrtimer based posix-timers and posix-cpu-timers handle the update of the
rearming and overflow related status fields differently.

Move that update to the common rearming code.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Cc: Peter Zijlstra <peterz@infradead.org>
Cc: John Stultz <john.stultz@linaro.org>
Link: http://lkml.kernel.org/r/20170530211656.484936964@linutronix.de
This commit is contained in:
Thomas Gleixner
2017-05-30 23:15:42 +02:00
parent bab0aae9dc
commit af888d677a
2 changed files with 15 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
kernel/time/posix-timers.c
View File

@@ -291,10 +291,6 @@ static void schedule_next_timer(struct k_itimer *timr)
timr->it_overrun += (unsigned int) hrtimer_forward(timer,
timer->base->get_time(),
timr->it.real.interval);
timr->it_overrun_last = timr->it_overrun;
timr->it_overrun = -1;
++timr->it_requeue_pending;
hrtimer_restart(timer);
}
@@ -315,18 +311,23 @@ void do_schedule_next_timer(struct siginfo *info)
unsigned long flags;
timr = lock_timer(info->si_tid, &flags);
if (!timr)
return;
if (timr && timr->it_requeue_pending == info->si_sys_private) {
if (timr->it_requeue_pending == info->si_sys_private) {
if (timr->it_clock < 0)
posix_cpu_timer_schedule(timr);
else
schedule_next_timer(timr);
timr->it_overrun_last = timr->it_overrun;
timr->it_overrun = -1;
++timr->it_requeue_pending;
info->si_overrun += timr->it_overrun_last;
}
if (timr)
unlock_timer(timr, flags);
unlock_timer(timr, flags);
}
int posix_timer_event(struct k_itimer *timr, int si_private)