Commit 24d568ed authored by Nishanth Aravamudan's avatar Nishanth Aravamudan Committed by Linus Torvalds

[PATCH] alpha/osf_sys: use helper functions to convert between tv and jiffies

Use helper functions to convert between timeval structure and jiffies
rather than custom logic.
Signed-off-by: default avatarNishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: default avatarDomen Puncer <domen@coderock.org>
Acked-by: default avatarRichard Henderson <rth@twiddle.net>
Signed-off-by: default avatarAndrew Morton <akpm@osdl.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@osdl.org>
parent 3407c0fe
...@@ -1150,16 +1150,13 @@ osf_usleep_thread(struct timeval32 __user *sleep, struct timeval32 __user *remai ...@@ -1150,16 +1150,13 @@ osf_usleep_thread(struct timeval32 __user *sleep, struct timeval32 __user *remai
if (get_tv32(&tmp, sleep)) if (get_tv32(&tmp, sleep))
goto fault; goto fault;
ticks = tmp.tv_usec; ticks = timeval_to_jiffies(&tmp);
ticks = (ticks + (1000000 / HZ) - 1) / (1000000 / HZ);
ticks += tmp.tv_sec * HZ;
current->state = TASK_INTERRUPTIBLE; current->state = TASK_INTERRUPTIBLE;
ticks = schedule_timeout(ticks); ticks = schedule_timeout(ticks);
if (remain) { if (remain) {
tmp.tv_sec = ticks / HZ; jiffies_to_timeval(ticks, &tmp);
tmp.tv_usec = ticks % HZ;
if (put_tv32(remain, &tmp)) if (put_tv32(remain, &tmp))
goto fault; goto fault;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment