diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 05:03:03 -0500 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2013-02-04 05:03:03 -0500 |
commit | 90889a635a9b5488624bccce3ff6b2eec68c007b (patch) | |
tree | 8ddde1e04060bd65ca2aafb09b38066cb7d69b4d /include | |
parent | a9037430c6c784165a940a90bcd29f886834c8e7 (diff) | |
parent | 6f16eebe1ff82176339a0439c98ebec9768b0ee2 (diff) |
Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core
Trivial conflict in arch/x86/Kconfig
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Diffstat (limited to 'include')
-rw-r--r-- | include/linux/rtc.h | 1 | ||||
-rw-r--r-- | include/linux/time.h | 12 |
2 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/rtc.h b/include/linux/rtc.h index 9531845c419f..11d05f9fe8b6 100644 --- a/include/linux/rtc.h +++ b/include/linux/rtc.h | |||
@@ -138,6 +138,7 @@ extern void rtc_device_unregister(struct rtc_device *rtc); | |||
138 | extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm); | 138 | extern int rtc_read_time(struct rtc_device *rtc, struct rtc_time *tm); |
139 | extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm); | 139 | extern int rtc_set_time(struct rtc_device *rtc, struct rtc_time *tm); |
140 | extern int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs); | 140 | extern int rtc_set_mmss(struct rtc_device *rtc, unsigned long secs); |
141 | extern int rtc_set_ntp_time(struct timespec now); | ||
141 | int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm); | 142 | int __rtc_read_alarm(struct rtc_device *rtc, struct rtc_wkalrm *alarm); |
142 | extern int rtc_read_alarm(struct rtc_device *rtc, | 143 | extern int rtc_read_alarm(struct rtc_device *rtc, |
143 | struct rtc_wkalrm *alrm); | 144 | struct rtc_wkalrm *alrm); |
diff --git a/include/linux/time.h b/include/linux/time.h index 4d358e9d10f1..476e1d7b2c37 100644 --- a/include/linux/time.h +++ b/include/linux/time.h | |||
@@ -115,6 +115,17 @@ static inline bool timespec_valid_strict(const struct timespec *ts) | |||
115 | return true; | 115 | return true; |
116 | } | 116 | } |
117 | 117 | ||
118 | extern bool persistent_clock_exist; | ||
119 | |||
120 | #ifdef ALWAYS_USE_PERSISTENT_CLOCK | ||
121 | #define has_persistent_clock() true | ||
122 | #else | ||
123 | static inline bool has_persistent_clock(void) | ||
124 | { | ||
125 | return persistent_clock_exist; | ||
126 | } | ||
127 | #endif | ||
128 | |||
118 | extern void read_persistent_clock(struct timespec *ts); | 129 | extern void read_persistent_clock(struct timespec *ts); |
119 | extern void read_boot_clock(struct timespec *ts); | 130 | extern void read_boot_clock(struct timespec *ts); |
120 | extern int update_persistent_clock(struct timespec now); | 131 | extern int update_persistent_clock(struct timespec now); |
@@ -158,6 +169,7 @@ extern int do_setitimer(int which, struct itimerval *value, | |||
158 | struct itimerval *ovalue); | 169 | struct itimerval *ovalue); |
159 | extern unsigned int alarm_setitimer(unsigned int seconds); | 170 | extern unsigned int alarm_setitimer(unsigned int seconds); |
160 | extern int do_getitimer(int which, struct itimerval *value); | 171 | extern int do_getitimer(int which, struct itimerval *value); |
172 | extern int __getnstimeofday(struct timespec *tv); | ||
161 | extern void getnstimeofday(struct timespec *tv); | 173 | extern void getnstimeofday(struct timespec *tv); |
162 | extern void getrawmonotonic(struct timespec *ts); | 174 | extern void getrawmonotonic(struct timespec *ts); |
163 | extern void getnstime_raw_and_real(struct timespec *ts_raw, | 175 | extern void getnstime_raw_and_real(struct timespec *ts_raw, |