diff options
author | Ingo Molnar <mingo@kernel.org> | 2013-04-21 05:04:42 -0400 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2013-04-21 05:04:42 -0400 |
commit | 2727872dfe5d273f313f8a0c0dd0fcc58e96cde7 (patch) | |
tree | 069ceb12d981f33d997afd214c2082a6685a2fd0 /include/linux/tick.h | |
parent | 65d798f0f9339ae2c4ebe9480e3260b33382a584 (diff) | |
parent | f98823ac758ba1aa77c6e3f8ad4ef3ad84ee0a7c (diff) |
Merge branch 'timers/nohz-reviewed' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks into timers/nohz
Pull full dynticks timekeeping and RCU improvements from Frederic Weisbecker.
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'include/linux/tick.h')
-rw-r--r-- | include/linux/tick.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/tick.h b/include/linux/tick.h index b4e3b0c9639e..0b6873cbf512 100644 --- a/include/linux/tick.h +++ b/include/linux/tick.h | |||
@@ -158,8 +158,10 @@ static inline u64 get_cpu_iowait_time_us(int cpu, u64 *unused) { return -1; } | |||
158 | # endif /* !CONFIG_NO_HZ_COMMON */ | 158 | # endif /* !CONFIG_NO_HZ_COMMON */ |
159 | 159 | ||
160 | #ifdef CONFIG_NO_HZ_FULL | 160 | #ifdef CONFIG_NO_HZ_FULL |
161 | extern void tick_nohz_init(void); | ||
161 | extern int tick_nohz_full_cpu(int cpu); | 162 | extern int tick_nohz_full_cpu(int cpu); |
162 | #else | 163 | #else |
164 | static inline void tick_nohz_init(void) { } | ||
163 | static inline int tick_nohz_full_cpu(int cpu) { return 0; } | 165 | static inline int tick_nohz_full_cpu(int cpu) { return 0; } |
164 | #endif | 166 | #endif |
165 | 167 | ||