From 92fd912fcc01fbd6a2c8ed00922eac64ba29c994 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Tue, 3 Aug 2010 20:34:48 +0200
Subject: [PATCH] --- yaml --- r: 206157 b: refs/heads/master c:
 b29230769e3482bbd62a07d6d9485371ee66a18f h: refs/heads/master i:   206155:
 b8e4ef959d242bea79ed5cbbb6072b4172a05e78 v: v3

---
 [refs]                      | 2 +-
 trunk/arch/um/kernel/time.c | 5 ++---
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/[refs] b/[refs]
index 771719a91797..ffecb5c4b393 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 157b1a23856b9fb7cc3d19fa2ddc650b502bab3d
+refs/heads/master: b29230769e3482bbd62a07d6d9485371ee66a18f
diff --git a/trunk/arch/um/kernel/time.c b/trunk/arch/um/kernel/time.c
index 2b8b262e5c23..a08d9fab81f2 100644
--- a/trunk/arch/um/kernel/time.c
+++ b/trunk/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;
 }