From 3a7674267f12d7aa55bb0c51a3dec79a36266a82 Mon Sep 17 00:00:00 2001 From: Nishanth Aravamudan Date: Mon, 16 May 2005 21:53:55 -0700 Subject: [PATCH] --- yaml --- r: 1170 b: refs/heads/master c: 24d568ed1b97cb93c2a917cd90296655a8b661a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/arch/alpha/kernel/osf_sys.c | 7 ++----- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index d71b16b3b991..afaba782c881 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 3407c0fec3456325826c31792e77a80a6dec0e20 +refs/heads/master: 24d568ed1b97cb93c2a917cd90296655a8b661a6 diff --git a/trunk/arch/alpha/kernel/osf_sys.c b/trunk/arch/alpha/kernel/osf_sys.c index 64e450dddb49..167fd89f8707 100644 --- a/trunk/arch/alpha/kernel/osf_sys.c +++ b/trunk/arch/alpha/kernel/osf_sys.c @@ -1150,16 +1150,13 @@ osf_usleep_thread(struct timeval32 __user *sleep, struct timeval32 __user *remai if (get_tv32(&tmp, sleep)) goto fault; - ticks = tmp.tv_usec; - ticks = (ticks + (1000000 / HZ) - 1) / (1000000 / HZ); - ticks += tmp.tv_sec * HZ; + ticks = timeval_to_jiffies(&tmp); current->state = TASK_INTERRUPTIBLE; ticks = schedule_timeout(ticks); if (remain) { - tmp.tv_sec = ticks / HZ; - tmp.tv_usec = ticks % HZ; + jiffies_to_timeval(ticks, &tmp); if (put_tv32(remain, &tmp)) goto fault; }