diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-14 13:46:10 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2013-02-14 13:46:10 -0500 |
| commit | 9f4646d28362bc424b8a4c7d09ea1c2f1759371a (patch) | |
| tree | 0ff9dc36f1ef598736725f3eb30e164128d39774 /include | |
| parent | 86c8ead593305915729a7b67f738832764fb4ba7 (diff) | |
| parent | 84e345e4e209cbe796c88fa2ad1732d7121ec100 (diff) | |
Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/time.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h index 476e1d7b2c37..a3ab6a814a9c 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
| @@ -128,6 +128,7 @@ static inline bool has_persistent_clock(void) | |||
| 128 | 128 | ||
| 129 | extern void read_persistent_clock(struct timespec *ts); | 129 | extern void read_persistent_clock(struct timespec *ts); |
| 130 | extern void read_boot_clock(struct timespec *ts); | 130 | extern void read_boot_clock(struct timespec *ts); |
| 131 | extern int persistent_clock_is_local; | ||
| 131 | extern int update_persistent_clock(struct timespec now); | 132 | extern int update_persistent_clock(struct timespec now); |
| 132 | void timekeeping_init(void); | 133 | void timekeeping_init(void); |
| 133 | extern int timekeeping_suspended; | 134 | extern int timekeeping_suspended; |