diff options
author | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-01 15:02:30 -0700 |
---|---|---|
committer | Arjan van de Ven <arjan@linux.intel.com> | 2008-09-05 21:35:13 -0700 |
commit | cc584b213f252bf698849cf4be2377cd3ec7501a (patch) | |
tree | 621ba11da6a2ab8598f9ed453836cd2c44192260 /kernel/futex.c | |
parent | 23dd7bb09bd8d7efd8a602aed97b93d52f85e675 (diff) | |
download | kernel_samsung_smdk4412-cc584b213f252bf698849cf4be2377cd3ec7501a.tar.gz kernel_samsung_smdk4412-cc584b213f252bf698849cf4be2377cd3ec7501a.tar.bz2 kernel_samsung_smdk4412-cc584b213f252bf698849cf4be2377cd3ec7501a.zip |
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/futex.c')
-rw-r--r-- | kernel/futex.c | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/futex.c b/kernel/futex.c index 7d1136e97c1..4cd5b4319b0 100644 --- a/kernel/futex.c +++ b/kernel/futex.c @@ -1299,10 +1299,9 @@ static int futex_wait(u32 __user *uaddr, struct rw_semaphore *fshared, hrtimer_init_on_stack(&t.timer, CLOCK_MONOTONIC, HRTIMER_MODE_ABS); hrtimer_init_sleeper(&t, current); - t.timer.expires = *abs_time; + hrtimer_set_expires(&t.timer, *abs_time); - hrtimer_start(&t.timer, t.timer.expires, - HRTIMER_MODE_ABS); + hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS); if (!hrtimer_active(&t.timer)) t.task = NULL; @@ -1404,7 +1403,7 @@ static int futex_lock_pi(u32 __user *uaddr, struct rw_semaphore *fshared, hrtimer_init_on_stack(&to->timer, CLOCK_REALTIME, HRTIMER_MODE_ABS); hrtimer_init_sleeper(to, current); - to->timer.expires = *time; + hrtimer_set_expires(&to->timer, *time); } q.pi_state = NULL; |