aboutsummaryrefslogtreecommitdiffstats
path: root/arch/um
diff options
context:
space:
mode:
authorJeff Dike <jdike@addtoit.com>2006-06-22 17:47:09 -0400
committerLinus Torvalds <torvalds@g5.osdl.org>2006-06-22 18:05:55 -0400
commit7f98a44b9d09580036da7e7f8b33e66f411cf374 (patch)
treed2200ab2fe158e696bcbde408cf4355f91f8d025 /arch/um
parent0dad31d2da706ef114bc5c21123123be2f405d5b (diff)
[PATCH] UML: fix wall_to_monotonic initialization
Change a variable from unsigned to signed in order to get sign-extension when the thing is negated. Without this, uptime is horribly confused. Signed-off-by: Jeff Dike <jdike@addtoit.com> Signed-off-by: Andrew Morton <akpm@osdl.org> Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'arch/um')
-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)
87 87
88void time_init_kern(void) 88void time_init_kern(void)
89{ 89{
90 unsigned long long nsecs; 90 long long nsecs;
91 91
92 nsecs = os_nsecs(); 92 nsecs = os_nsecs();
93 set_normalized_timespec(&wall_to_monotonic, -nsecs / BILLION, 93 set_normalized_timespec(&wall_to_monotonic, -nsecs / BILLION,