summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2010-08-03 20:34:48 +0200
committerThomas Gleixner <tglx@linutronix.de>2010-08-03 20:36:07 +0200
commitb29230769e3482bbd62a07d6d9485371ee66a18f (patch)
tree474f321f063adae11a0288d2f1c06e5e33828450
parentkgdb: Do not access xtime directly (diff)
downloadlinux-b29230769e3482bbd62a07d6d9485371ee66a18f.tar.xz
linux-b29230769e3482bbd62a07d6d9485371ee66a18f.zip
um: Fix read_persistent_clock fallout
commit 9f31f57(um: Convert to use read_persistent_clock) moved the code, but not the variable. Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
-rw-r--r--arch/um/kernel/time.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 2b8b262e5c23..a08d9fab81f2 100644
--- a/arch/um/kernel/time.c
+++ b/arch/um/kernel/time.c
@@ -104,15 +104,14 @@ static void __init setup_itimer(void)
void read_persistent_clock(struct timespec *ts)
{
- nsecs = os_nsecs();
+ long long nsecs = os_nsecs();
+
set_normalized_timespec(ts, nsecs / NSEC_PER_SEC,
nsecs % NSEC_PER_SEC);
}
void __init time_init(void)
{
- long long nsecs;
-
timer_init();
late_time_init = setup_itimer;
}