aboutsummaryrefslogtreecommitdiffstats
path: root/kernel/futex.c
diff options
context:
space:
mode:
authorArjan van de Ven <arjan@linux.intel.com>2008-09-01 18:02:30 -0400
committerArjan van de Ven <arjan@linux.intel.com>2008-09-06 00:35:13 -0400
commitcc584b213f252bf698849cf4be2377cd3ec7501a (patch)
tree621ba11da6a2ab8598f9ed453836cd2c44192260 /kernel/futex.c
parent23dd7bb09bd8d7efd8a602aed97b93d52f85e675 (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/futex.c')
-rw-r--r--kernel/futex.c7
1 files changed, 3 insertions, 4 deletions
diff --git a/kernel/futex.c b/kernel/futex.c
index 7d1136e97c14..4cd5b4319b04 100644
--- a/kernel/futex.c
+++ b/kernel/futex.c
@@ -1299,10 +1299,9 @@ static int futex_wait(u32 __user *uaddr, struct rw_semaphore *fshared,
1299 hrtimer_init_on_stack(&t.timer, CLOCK_MONOTONIC, 1299 hrtimer_init_on_stack(&t.timer, CLOCK_MONOTONIC,
1300 HRTIMER_MODE_ABS); 1300 HRTIMER_MODE_ABS);
1301 hrtimer_init_sleeper(&t, current); 1301 hrtimer_init_sleeper(&t, current);
1302 t.timer.expires = *abs_time; 1302 hrtimer_set_expires(&t.timer, *abs_time);
1303 1303
1304 hrtimer_start(&t.timer, t.timer.expires, 1304 hrtimer_start_expires(&t.timer, HRTIMER_MODE_ABS);
1305 HRTIMER_MODE_ABS);
1306 if (!hrtimer_active(&t.timer)) 1305 if (!hrtimer_active(&t.timer))
1307 t.task = NULL; 1306 t.task = NULL;
1308 1307
@@ -1404,7 +1403,7 @@ static int futex_lock_pi(u32 __user *uaddr, struct rw_semaphore *fshared,
1404 hrtimer_init_on_stack(&to->timer, CLOCK_REALTIME, 1403 hrtimer_init_on_stack(&to->timer, CLOCK_REALTIME,
1405 HRTIMER_MODE_ABS); 1404 HRTIMER_MODE_ABS);
1406 hrtimer_init_sleeper(to, current); 1405 hrtimer_init_sleeper(to, current);
1407 to->timer.expires = *time; 1406 hrtimer_set_expires(&to->timer, *time);
1408 } 1407 }
1409 1408
1410 q.pi_state = NULL; 1409 q.pi_state = NULL;