summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-06-20 18:25:03 -0400
committerChris Wright <chrisw@sous-sol.org>2006-06-29 17:17:16 -0700
commite0072c1bbbdcb819e8df0a67229bb9eed2accec3 (patch)
tree0c4d0022e5ae1f792f8462b01a4e3437bfe53eac
parente45424909c0a8ffc7afbea6e35da582f782fc618 (diff)
downloadlwn-e0072c1bbbdcb819e8df0a67229bb9eed2accec3.tar.gz
lwn-e0072c1bbbdcb819e8df0a67229bb9eed2accec3.zip
[PATCH] UML: fix uptime
The use of signed instead of unsigned here broke the calculations on negative numbers that are involved in calculating wall_to_monotonic. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Chris Wright <chrisw@sous-sol.org>
-rw-r--r--arch/um/kernel/time_kern.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/um/kernel/time_kern.c b/arch/um/kernel/time_kern.c
index 86f51d04c98d..87cdbc560d36 100644
--- a/arch/um/kernel/time_kern.c
+++ b/arch/um/kernel/time_kern.c
@@ -87,7 +87,7 @@ void timer_irq(union uml_pt_regs *regs)
void time_init_kern(void)
{
- unsigned long long nsecs;
+ long long nsecs;
nsecs = os_nsecs();
set_normalized_timespec(&wall_to_monotonic, -nsecs / BILLION,