summaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2009-06-15 09:58:33 -0700
committerLinus Torvalds <torvalds@linux-foundation.org>2009-06-15 09:58:33 -0700
commit3f27c0d2a469673e0f1efc8004b6f42428aa5b94 (patch)
tree548c975cabdcafcac92992d24410ae0a8334dff5 /include
parent9aaa630503f20461bee65ebc4fd87ba8d7a2bd2c (diff)
parentcd6d95d8449b7c9f415f26041e9ae173d387b6bd (diff)
downloadop-kernel-dev-3f27c0d2a469673e0f1efc8004b6f42428aa5b94.zip
op-kernel-dev-3f27c0d2a469673e0f1efc8004b6f42428aa5b94.tar.gz
Merge branch 'timers-for-linus-clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip
* 'timers-for-linus-clocksource' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/linux-2.6-tip: clocksource: prevent selection of low resolution clocksourse also for nohz=on clocksource: sanity check sysfs clocksource changes
Diffstat (limited to 'include')
-rw-r--r--include/linux/tick.h3
1 files changed, 3 insertions, 0 deletions
diff --git a/include/linux/tick.h b/include/linux/tick.h
index 469b82d..0482229 100644
--- a/include/linux/tick.h
+++ b/include/linux/tick.h
@@ -97,10 +97,12 @@ extern void tick_clock_notify(void);
extern int tick_check_oneshot_change(int allow_nohz);
extern struct tick_sched *tick_get_tick_sched(int cpu);
extern void tick_check_idle(int cpu);
+extern int tick_oneshot_mode_active(void);
# else
static inline void tick_clock_notify(void) { }
static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }
static inline void tick_check_idle(int cpu) { }
+static inline int tick_oneshot_mode_active(void) { return 0; }
# endif
#else /* CONFIG_GENERIC_CLOCKEVENTS */
@@ -109,6 +111,7 @@ static inline void tick_cancel_sched_timer(int cpu) { }
static inline void tick_clock_notify(void) { }
static inline int tick_check_oneshot_change(int allow_nohz) { return 0; }
static inline void tick_check_idle(int cpu) { }
+static inline int tick_oneshot_mode_active(void) { return 0; }
#endif /* !CONFIG_GENERIC_CLOCKEVENTS */
# ifdef CONFIG_NO_HZ
OpenPOWER on IntegriCloud