Commit-ID: b29230769e3482bbd62a07d6d9485371ee66a18f
Gitweb: http://git.kernel.org/tip/b29230769e3482bbd62a07d6d9485371ee66a18f
Author: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
AuthorDate: Tue, 3 Aug 2010 20:34:48 +0200
Committer: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
CommitDate: Tue, 3 Aug 2010 20:36:07 +0200
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@xxxxxxxxxxxxx>
---
arch/um/kernel/time.c | 5 ++---
1 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/arch/um/kernel/time.c b/arch/um/kernel/time.c
index 2b8b262..a08d9fa 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;
}
--
To unsubscribe from this list: send the line "unsubscribe linux-tip-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
|