diff options
author | John Stultz <john.stultz@linaro.org> | 2012-09-04 15:12:07 -0400 |
---|---|---|
committer | John Stultz <john.stultz@linaro.org> | 2012-09-24 12:38:05 -0400 |
commit | d7b4202e0581683f1a14fe598633da0067f5241e (patch) | |
tree | 437a9d3e935c8ec9f00ed091f71e5483f4669978 | |
parent | b3c869d35b9b014f63ac0beacd31c57372084d01 (diff) |
time: Move timekeeper structure to timekeeper_internal.h for vsyscall changes
We're going to need to access the timekeeper in update_vsyscall,
so make the structure available for those who need it.
Cc: Tony Luck <tony.luck@intel.com>
Cc: Paul Mackerras <paulus@samba.org>
Cc: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Cc: Andy Lutomirski <luto@amacapital.net>
Cc: Martin Schwidefsky <schwidefsky@de.ibm.com>
Cc: Paul Turner <pjt@google.com>
Cc: Steven Rostedt <rostedt@goodmis.org>
Cc: Richard Cochran <richardcochran@gmail.com>
Cc: Prarit Bhargava <prarit@redhat.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: John Stultz <john.stultz@linaro.org>
-rw-r--r-- | include/linux/timekeeper_internal.h | 68 | ||||
-rw-r--r-- | kernel/time/timekeeping.c | 56 |
2 files changed, 69 insertions, 55 deletions
diff --git a/include/linux/timekeeper_internal.h b/include/linux/timekeeper_internal.h new file mode 100644 index 000000000000..8ba43fa8c7e6 --- /dev/null +++ b/include/linux/timekeeper_internal.h | |||
@@ -0,0 +1,68 @@ | |||
1 | /* | ||
2 | * You SHOULD NOT be including this unless you're vsyscall | ||
3 | * handling code or timekeeping internal code! | ||
4 | */ | ||
5 | |||
6 | #ifndef _LINUX_TIMEKEEPER_INTERNAL_H | ||
7 | #define _LINUX_TIMEKEEPER_INTERNAL_H | ||
8 | |||
9 | #include <linux/clocksource.h> | ||
10 | #include <linux/jiffies.h> | ||
11 | #include <linux/time.h> | ||
12 | |||
13 | /* Structure holding internal timekeeping values. */ | ||
14 | struct timekeeper { | ||
15 | /* Current clocksource used for timekeeping. */ | ||
16 | struct clocksource *clock; | ||
17 | /* NTP adjusted clock multiplier */ | ||
18 | u32 mult; | ||
19 | /* The shift value of the current clocksource. */ | ||
20 | u32 shift; | ||
21 | /* Number of clock cycles in one NTP interval. */ | ||
22 | cycle_t cycle_interval; | ||
23 | /* Number of clock shifted nano seconds in one NTP interval. */ | ||
24 | u64 xtime_interval; | ||
25 | /* shifted nano seconds left over when rounding cycle_interval */ | ||
26 | s64 xtime_remainder; | ||
27 | /* Raw nano seconds accumulated per NTP interval. */ | ||
28 | u32 raw_interval; | ||
29 | |||
30 | /* Current CLOCK_REALTIME time in seconds */ | ||
31 | u64 xtime_sec; | ||
32 | /* Clock shifted nano seconds */ | ||
33 | u64 xtime_nsec; | ||
34 | |||
35 | /* Difference between accumulated time and NTP time in ntp | ||
36 | * shifted nano seconds. */ | ||
37 | s64 ntp_error; | ||
38 | /* Shift conversion between clock shifted nano seconds and | ||
39 | * ntp shifted nano seconds. */ | ||
40 | u32 ntp_error_shift; | ||
41 | |||
42 | /* | ||
43 | * wall_to_monotonic is what we need to add to xtime (or xtime corrected | ||
44 | * for sub jiffie times) to get to monotonic time. Monotonic is pegged | ||
45 | * at zero at system boot time, so wall_to_monotonic will be negative, | ||
46 | * however, we will ALWAYS keep the tv_nsec part positive so we can use | ||
47 | * the usual normalization. | ||
48 | * | ||
49 | * wall_to_monotonic is moved after resume from suspend for the | ||
50 | * monotonic time not to jump. We need to add total_sleep_time to | ||
51 | * wall_to_monotonic to get the real boot based time offset. | ||
52 | * | ||
53 | * - wall_to_monotonic is no longer the boot time, getboottime must be | ||
54 | * used instead. | ||
55 | */ | ||
56 | struct timespec wall_to_monotonic; | ||
57 | /* Offset clock monotonic -> clock realtime */ | ||
58 | ktime_t offs_real; | ||
59 | /* time spent in suspend */ | ||
60 | struct timespec total_sleep_time; | ||
61 | /* Offset clock monotonic -> clock boottime */ | ||
62 | ktime_t offs_boot; | ||
63 | /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */ | ||
64 | struct timespec raw_time; | ||
65 | /* Seqlock for all timekeeper values */ | ||
66 | seqlock_t lock; | ||
67 | }; | ||
68 | #endif /* _LINUX_TIMEKEEPER_INTERNAL_H */ | ||
diff --git a/kernel/time/timekeeping.c b/kernel/time/timekeeping.c index d3b91e75cecd..02c19d3d8e0d 100644 --- a/kernel/time/timekeeping.c +++ b/kernel/time/timekeeping.c | |||
@@ -8,6 +8,7 @@ | |||
8 | * | 8 | * |
9 | */ | 9 | */ |
10 | 10 | ||
11 | #include <linux/timekeeper_internal.h> | ||
11 | #include <linux/module.h> | 12 | #include <linux/module.h> |
12 | #include <linux/interrupt.h> | 13 | #include <linux/interrupt.h> |
13 | #include <linux/percpu.h> | 14 | #include <linux/percpu.h> |
@@ -21,61 +22,6 @@ | |||
21 | #include <linux/tick.h> | 22 | #include <linux/tick.h> |
22 | #include <linux/stop_machine.h> | 23 | #include <linux/stop_machine.h> |
23 | 24 | ||
24 | /* Structure holding internal timekeeping values. */ | ||
25 | struct timekeeper { | ||
26 | /* Current clocksource used for timekeeping. */ | ||
27 | struct clocksource *clock; | ||
28 | /* NTP adjusted clock multiplier */ | ||
29 | u32 mult; | ||
30 | /* The shift value of the current clocksource. */ | ||
31 | u32 shift; | ||
32 | /* Number of clock cycles in one NTP interval. */ | ||
33 | cycle_t cycle_interval; | ||
34 | /* Number of clock shifted nano seconds in one NTP interval. */ | ||
35 | u64 xtime_interval; | ||
36 | /* shifted nano seconds left over when rounding cycle_interval */ | ||
37 | s64 xtime_remainder; | ||
38 | /* Raw nano seconds accumulated per NTP interval. */ | ||
39 | u32 raw_interval; | ||
40 | |||
41 | /* Current CLOCK_REALTIME time in seconds */ | ||
42 | u64 xtime_sec; | ||
43 | /* Clock shifted nano seconds */ | ||
44 | u64 xtime_nsec; | ||
45 | |||
46 | /* Difference between accumulated time and NTP time in ntp | ||
47 | * shifted nano seconds. */ | ||
48 | s64 ntp_error; | ||
49 | /* Shift conversion between clock shifted nano seconds and | ||
50 | * ntp shifted nano seconds. */ | ||
51 | u32 ntp_error_shift; | ||
52 | |||
53 | /* | ||
54 | * wall_to_monotonic is what we need to add to xtime (or xtime corrected | ||
55 | * for sub jiffie times) to get to monotonic time. Monotonic is pegged | ||
56 | * at zero at system boot time, so wall_to_monotonic will be negative, | ||
57 | * however, we will ALWAYS keep the tv_nsec part positive so we can use | ||
58 | * the usual normalization. | ||
59 | * | ||
60 | * wall_to_monotonic is moved after resume from suspend for the | ||
61 | * monotonic time not to jump. We need to add total_sleep_time to | ||
62 | * wall_to_monotonic to get the real boot based time offset. | ||
63 | * | ||
64 | * - wall_to_monotonic is no longer the boot time, getboottime must be | ||
65 | * used instead. | ||
66 | */ | ||
67 | struct timespec wall_to_monotonic; | ||
68 | /* Offset clock monotonic -> clock realtime */ | ||
69 | ktime_t offs_real; | ||
70 | /* time spent in suspend */ | ||
71 | struct timespec total_sleep_time; | ||
72 | /* Offset clock monotonic -> clock boottime */ | ||
73 | ktime_t offs_boot; | ||
74 | /* The raw monotonic time for the CLOCK_MONOTONIC_RAW posix clock. */ | ||
75 | struct timespec raw_time; | ||
76 | /* Seqlock for all timekeeper values */ | ||
77 | seqlock_t lock; | ||
78 | }; | ||
79 | 25 | ||
80 | static struct timekeeper timekeeper; | 26 | static struct timekeeper timekeeper; |
81 | 27 | ||