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

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

[domen]

[-- Attachment #1: timeval-arch_alpha_kernel_osf_sys --]
[-- Type: text/plain, Size: 1014 bytes --]

From: Nishanth Aravamudan <nacc@us.ibm.com>


Use helper functions to convert between timeval structure and jiffies
rather than custom logic.

Signed-off-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: Domen Puncer <domen@coderock.org>

---
 osf_sys.c |    7 ++-----
 1 files changed, 2 insertions(+), 5 deletions(-)

Index: quilt/arch/alpha/kernel/osf_sys.c
===================================================================
--- quilt.orig/arch/alpha/kernel/osf_sys.c
+++ quilt/arch/alpha/kernel/osf_sys.c
@@ -1150,16 +1150,13 @@ osf_usleep_thread(struct timeval32 __use
 	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;
 	}

--

Re: [patch 1/1] alpha/osf_sys: use helper functions to convert between tv and jiffies

[Alexey Dobriyan]

On Saturday 14 May 2005 01:44, domen@coderock.org wrote:
> Use helper functions to convert between timeval structure and jiffies
> rather than custom logic.

> --- quilt.orig/arch/alpha/kernel/osf_sys.c
> +++ quilt/arch/alpha/kernel/osf_sys.c

> -	ticks = tmp.tv_usec;
> -	ticks = (ticks + (1000000 / HZ) - 1) / (1000000 / HZ);
> -	ticks += tmp.tv_sec * HZ;
> +	ticks = timeval_to_jiffies(&tmp);

> -		tmp.tv_sec = ticks / HZ;
> -		tmp.tv_usec = ticks % HZ;
> +		jiffies_to_timeval(ticks, &tmp);

Nitpicking comment: both timeval_to_jiffies and jiffies_to_timeval are
prototyped in include/linux/jiffies.h. However, arch/alpha/kernel/osf_sys.c
doesn't directly #include it.