Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

[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

arch/alpha/kernel/osf_sys.c

+2 −5
Original line number Diff line number Diff line
@@ -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;

	}