History

Merge branch 'fortglx/3.9/time' of git://git.linaro.org/people/jstultz/linux into timers/core

Thomas Gleixner committed 13 years ago

Commit 9f4646d2 parents 86c8ead 84e345e3 files · +15 −2Browse files

Showing the changes to include (1 of 3 files). Show all

Unified · Split

include/linux/time.h+1−0
@@ -128,6 +128,7 @@ static inline bool has_persistent_clock(void) · 127 unmodified lines
128 128
129extern void read_persistent_clock(struct timespec *ts);129extern void read_persistent_clock(struct timespec *ts);
130extern void read_boot_clock(struct timespec *ts);130extern void read_boot_clock(struct timespec *ts);
131extern int persistent_clock_is_local;
131extern int update_persistent_clock(struct timespec now);132extern int update_persistent_clock(struct timespec now);
132void timekeeping_init(void);133void timekeeping_init(void);
133extern int timekeeping_suspended;134extern int timekeeping_suspended;