summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorThomas Gleixner <tglx@linutronix.de>2013-02-14 18:46:10 (GMT)
committerThomas Gleixner <tglx@linutronix.de>2013-02-14 18:46:10 (GMT)
commit9f4646d28362bc424b8a4c7d09ea1c2f1759371a (patch)
tree0ff9dc36f1ef598736725f3eb30e164128d39774 /include
parent86c8ead593305915729a7b67f738832764fb4ba7 (diff)
parent84e345e4e209cbe796c88fa2ad1732d7121ec100 (diff)
downloadlinux-9f4646d28362bc424b8a4c7d09ea1c2f1759371a.tar.xz
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.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/include/linux/time.h b/include/linux/time.h
index 476e1d7..a3ab6a8 100644
--- a/include/linux/time.h
+++ b/include/linux/time.h
@@ -128,6 +128,7 @@ static inline bool has_persistent_clock(void)
extern void read_persistent_clock(struct timespec *ts);
extern void read_boot_clock(struct timespec *ts);
+extern int persistent_clock_is_local;
extern int update_persistent_clock(struct timespec now);
void timekeeping_init(void);
extern int timekeeping_suspended;