Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 23dd7bb09bd8d7efd8a602aed97b93d52f85e675

Authored by Arjan van de Ven
1 parent 76369470b7
Exists in master and in 7 other branches 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, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

hrtimer: convert net::sched_cbq to the new hrtimer apis 

In order to be able to do range hrtimers we need to use accessor functions
to the "expire" member of the hrtimer struct.
This patch converts sched_cbq to these accessors.

Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>

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

... ... @@ -545,9 +545,10 @@
545 545 expires = ktime_set(0, 0);
546 546 expires = ktime_add_ns(expires, PSCHED_US2NS(sched));
547 547 if (hrtimer_try_to_cancel(&q->delay_timer) &&
548   - ktime_to_ns(ktime_sub(q->delay_timer.expires,
549   - expires)) > 0)
550   - q->delay_timer.expires = expires;
  548 + ktime_to_ns(ktime_sub(
  549 + hrtimer_get_expires(&q->delay_timer),
  550 + expires)) > 0)
  551 + hrtimer_set_expires(&q->delay_timer, expires);
551 552 hrtimer_restart(&q->delay_timer);
552 553 cl->delayed = 1;
553 554 cl->xstats.overactions++;