diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-06-23 16:46:23 -0400 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-06-23 16:46:23 -0400 |
| commit | 8cf60e04a131310199d5776e2f9e915f0c468899 (patch) | |
| tree | 373a68e88e6737713a0a5723d552cdeefffff929 /arch/um/kernel/time_kern.c | |
| parent | 1323523f505606cfd24af6122369afddefc3b09d (diff) | |
| parent | 95eaa5fa8eb2c345244acd5f65b200b115ae8c65 (diff) | |
Auto-update from upstream
Diffstat (limited to 'arch/um/kernel/time_kern.c')
| -rw-r--r-- | arch/um/kernel/time_kern.c | 2 |
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 | ||
| 88 | void time_init_kern(void) | 88 | void 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, |