1 /* 1 /*
2 * Copyright (C) 2001 Andrea Arcangeli <andre 2 * Copyright (C) 2001 Andrea Arcangeli <andrea@suse.de> SuSE
3 * Copyright 2003 Andi Kleen, SuSE Labs. 3 * Copyright 2003 Andi Kleen, SuSE Labs.
4 * 4 *
5 * Thanks to hpa@transmeta.com for some usefu 5 * Thanks to hpa@transmeta.com for some useful hint.
6 * Special thanks to Ingo Molnar for his earl 6 * Special thanks to Ingo Molnar for his early experience with
7 * a different vsyscall implementation for Li 7 * a different vsyscall implementation for Linux/IA32 and for the name.
8 */ 8 */
9 9
10 #include <linux/time.h> 10 #include <linux/time.h>
11 #include <linux/timekeeper_internal.h> 11 #include <linux/timekeeper_internal.h>
12 12
13 #include <asm/vvar.h> 13 #include <asm/vvar.h>
14 14
15 void update_vsyscall_tz(void) 15 void update_vsyscall_tz(void)
16 { 16 {
17 if (unlikely(vvar_data == NULL)) 17 if (unlikely(vvar_data == NULL))
18 return; 18 return;
19 19
20 vvar_data->tz_minuteswest = sys_tz.tz_ 20 vvar_data->tz_minuteswest = sys_tz.tz_minuteswest;
21 vvar_data->tz_dsttime = sys_tz.tz_dstt 21 vvar_data->tz_dsttime = sys_tz.tz_dsttime;
22 } 22 }
23 23
24 void update_vsyscall(struct timekeeper *tk) 24 void update_vsyscall(struct timekeeper *tk)
25 { 25 {
26 struct vvar_data *vdata = vvar_data; 26 struct vvar_data *vdata = vvar_data;
27 27
28 if (unlikely(vdata == NULL)) 28 if (unlikely(vdata == NULL))
29 return; 29 return;
30 30
31 vvar_write_begin(vdata); 31 vvar_write_begin(vdata);
32 vdata->vclock_mode = tk->tkr_mono.cloc 32 vdata->vclock_mode = tk->tkr_mono.clock->archdata.vclock_mode;
33 vdata->clock.cycle_last = tk->tkr_mono 33 vdata->clock.cycle_last = tk->tkr_mono.cycle_last;
34 vdata->clock.mask = tk->tkr_mono.mask; 34 vdata->clock.mask = tk->tkr_mono.mask;
35 vdata->clock.mult = tk->tkr_mono.mult; 35 vdata->clock.mult = tk->tkr_mono.mult;
36 vdata->clock.shift = tk->tkr_mono.shif 36 vdata->clock.shift = tk->tkr_mono.shift;
37 37
38 vdata->wall_time_sec = tk->xtime_sec; 38 vdata->wall_time_sec = tk->xtime_sec;
39 vdata->wall_time_snsec = tk->tkr_mono. 39 vdata->wall_time_snsec = tk->tkr_mono.xtime_nsec;
40 40
41 vdata->monotonic_time_sec = tk->xtime_ 41 vdata->monotonic_time_sec = tk->xtime_sec +
42 tk->wall_t 42 tk->wall_to_monotonic.tv_sec;
43 vdata->monotonic_time_snsec = tk->tkr_ 43 vdata->monotonic_time_snsec = tk->tkr_mono.xtime_nsec +
44 (tk->wal 44 (tk->wall_to_monotonic.tv_nsec <<
45 tk->tkr 45 tk->tkr_mono.shift);
46 46
47 while (vdata->monotonic_time_snsec >= 47 while (vdata->monotonic_time_snsec >=
48 (((u64)NSEC_PER_SEC) << tk->tkr 48 (((u64)NSEC_PER_SEC) << tk->tkr_mono.shift)) {
49 vdata->monotonic_time_snsec -= 49 vdata->monotonic_time_snsec -=
50 ((u64)NSEC_PER 50 ((u64)NSEC_PER_SEC) << tk->tkr_mono.shift;
51 vdata->monotonic_time_sec++; 51 vdata->monotonic_time_sec++;
52 } 52 }
53 53
54 vdata->wall_time_coarse_sec = tk->xtim 54 vdata->wall_time_coarse_sec = tk->xtime_sec;
55 vdata->wall_time_coarse_nsec = 55 vdata->wall_time_coarse_nsec =
56 (long)(tk->tkr_mono.xt 56 (long)(tk->tkr_mono.xtime_nsec >> tk->tkr_mono.shift);
57 57
58 vdata->monotonic_time_coarse_sec = 58 vdata->monotonic_time_coarse_sec =
59 vdata->wall_time_coarse_sec + 59 vdata->wall_time_coarse_sec + tk->wall_to_monotonic.tv_sec;
60 vdata->monotonic_time_coarse_nsec = 60 vdata->monotonic_time_coarse_nsec =
61 vdata->wall_time_coarse_nsec + 61 vdata->wall_time_coarse_nsec + tk->wall_to_monotonic.tv_nsec;
62 62
63 while (vdata->monotonic_time_coarse_ns 63 while (vdata->monotonic_time_coarse_nsec >= NSEC_PER_SEC) {
64 vdata->monotonic_time_coarse_n 64 vdata->monotonic_time_coarse_nsec -= NSEC_PER_SEC;
65 vdata->monotonic_time_coarse_s 65 vdata->monotonic_time_coarse_sec++;
66 } 66 }
67 67
68 vvar_write_end(vdata); 68 vvar_write_end(vdata);
69 } 69 }
70 70
Linux® is a registered trademark of Linus Torvalds in the United States and other countries.
TOMOYO® is a registered trademark of NTT DATA CORPORATION.