diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2010-08-03 14:34:48 -0400 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2010-08-03 14:36:07 -0400 |
commit | b29230769e3482bbd62a07d6d9485371ee66a18f (patch) | |
tree | 474f321f063adae11a0288d2f1c06e5e33828450 /arch/um | |
parent | 157b1a23856b9fb7cc3d19fa2ddc650b502bab3d (diff) |
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>
Diffstat (limited to 'arch/um')
-rw-r--r-- | 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 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) | |||
104 | 104 | ||
105 | void read_persistent_clock(struct timespec *ts) | 105 | void read_persistent_clock(struct timespec *ts) |
106 | { | 106 | { |
107 | nsecs = os_nsecs(); | 107 | long long nsecs = os_nsecs(); |
108 | |||
108 | set_normalized_timespec(ts, nsecs / NSEC_PER_SEC, | 109 | set_normalized_timespec(ts, nsecs / NSEC_PER_SEC, |
109 | nsecs % NSEC_PER_SEC); | 110 | nsecs % NSEC_PER_SEC); |
110 | } | 111 | } |
111 | 112 | ||
112 | void __init time_init(void) | 113 | void __init time_init(void) |
113 | { | 114 | { |
114 | long long nsecs; | ||
115 | |||
116 | timer_init(); | 115 | timer_init(); |
117 | late_time_init = setup_itimer; | 116 | late_time_init = setup_itimer; |
118 | } | 117 | } |