diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-01 18:02:30 -0400 |
---|---|---|
committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-06 00:35:13 -0400 |
commit | cc584b213f252bf698849cf4be2377cd3ec7501a (patch) | |
tree | 621ba11da6a2ab8598f9ed453836cd2c44192260 /kernel/sched.c | |
parent | 23dd7bb09bd8d7efd8a602aed97b93d52f85e675 (diff) |
hrtimer: convert kernel/* 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 kernel/* to these accessors.
Signed-off-by: Arjan van de Ven <arjan@linux.intel.com>
Diffstat (limited to 'kernel/sched.c')
-rw-r--r-- | kernel/sched.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/sched.c b/kernel/sched.c index 1a5f73c1fcdc..e46b5afa200d 100644 --- a/kernel/sched.c +++ b/kernel/sched.c | |||
@@ -221,9 +221,8 @@ static void start_rt_bandwidth(struct rt_bandwidth *rt_b) | |||
221 | 221 | ||
222 | now = hrtimer_cb_get_time(&rt_b->rt_period_timer); | 222 | now = hrtimer_cb_get_time(&rt_b->rt_period_timer); |
223 | hrtimer_forward(&rt_b->rt_period_timer, now, rt_b->rt_period); | 223 | hrtimer_forward(&rt_b->rt_period_timer, now, rt_b->rt_period); |
224 | hrtimer_start(&rt_b->rt_period_timer, | 224 | hrtimer_start_expires(&rt_b->rt_period_timer, |
225 | rt_b->rt_period_timer.expires, | 225 | HRTIMER_MODE_ABS); |
226 | HRTIMER_MODE_ABS); | ||
227 | } | 226 | } |
228 | spin_unlock(&rt_b->rt_runtime_lock); | 227 | spin_unlock(&rt_b->rt_runtime_lock); |
229 | } | 228 | } |
@@ -1058,7 +1057,7 @@ static void hrtick_start(struct rq *rq, u64 delay) | |||
1058 | struct hrtimer *timer = &rq->hrtick_timer; | 1057 | struct hrtimer *timer = &rq->hrtick_timer; |
1059 | ktime_t time = ktime_add_ns(timer->base->get_time(), delay); | 1058 | ktime_t time = ktime_add_ns(timer->base->get_time(), delay); |
1060 | 1059 | ||
1061 | timer->expires = time; | 1060 | hrtimer_set_expires(timer, time); |
1062 | 1061 | ||
1063 | if (rq == this_rq()) { | 1062 | if (rq == this_rq()) { |
1064 | hrtimer_restart(timer); | 1063 | hrtimer_restart(timer); |