Eric Lee / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit a16a1c095a2392d49fafea22f3a508e268ef7167

Authored by Thomas Gleixner
Committed by Linus Torvalds
1 parent b6557fbca8
Exists in master and in 39 other branches 8mp-imx_5.4.70_2.3.0, 8qm-imx_5.4.70_2.3.0, emb_imx_lf-5.15.y, emb_lf-6.1.y, imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, imx_4.1.15_1.0.0_ga, pitx_8mp_lf-5.10.y, rt-smarc-imx_4.1.15_1.0.0_ga, rt_linux_5.15.71, smarc-8m-android-11.0.0_2.0.0, smarc-imx6_4.14.98_2.0.0_ga, smarc-imx6_4.9.88_2.0.0_ga, smarc-imx7_4.14.98_2.0.0_ga, smarc-imx7_4.9.11_1.0.0_ga, smarc-imx7_4.9.88_2.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-imx_4.1.15_1.0.0_ga, smarc-imx_4.9.11_1.0.0_ga, smarc-imx_4.9.51_imx8m_ga, smarc-imx_4.9.88_2.0.0_ga, smarc-m6.0.1_2.1.0-ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_1.2.0_ga, smarc_8m_00d0_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.14.78_1.0.0_ga, smarc_8m_imx_4.14.98_2.0.0_ga, smarc_8m_imx_4.19.35_1.1.0, smarc_8mm_imx_4.14.78_1.0.0_ga, smarc_8mm_imx_4.14.98_2.0.0_ga, smarc_8mm_imx_4.19.35_1.1.0, smarc_8mm_imx_5.4.24_2.1.0, smarc_8mp_lf-5.10.y, smarc_8mq_imx_5.4.24_2.1.0, smarc_8mq_lf-5.10.y, smarc_imx_lf-5.15.y

[PATCH] hrtimers: fix oldvalue return in setitimer 

This resolves bugzilla bug#5617.  The oldvalue of the timer was read after the
timer was cancelled, so the remaining time was always zero.

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

Showing 1 changed file with 5 additions and 5 deletions Side-by-side Diff

... ... @@ -155,15 +155,15 @@
155 155 again:
156 156 spin_lock_irq(&tsk->sighand->siglock);
157 157 timer = &tsk->signal->real_timer;
158   - /* We are sharing ->siglock with it_real_fn() */
159   - if (hrtimer_try_to_cancel(timer) < 0) {
160   - spin_unlock_irq(&tsk->sighand->siglock);
161   - goto again;
162   - }
163 158 if (ovalue) {
164 159 ovalue->it_value = itimer_get_remtime(timer);
165 160 ovalue->it_interval
166 161 = ktime_to_timeval(tsk->signal->it_real_incr);
  162 + }
  163 + /* We are sharing ->siglock with it_real_fn() */
  164 + if (hrtimer_try_to_cancel(timer) < 0) {
  165 + spin_unlock_irq(&tsk->sighand->siglock);
  166 + goto again;
167 167 }
168 168 tsk->signal->it_real_incr =
169 169 timeval_to_ktime(value->it_interval);