diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-08-28 13:37:31 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-08-28 13:37:31 -0400 |
| commit | cdf0bfb0126bbd8c5424ca01fd59fd70d8ea80f9 (patch) | |
| tree | e7864d3dacf433b7ccbe17a49b2e72b6a4b3a24c /include/linux/tick.h | |
| parent | b4f656eea63376da79b0b5a17660c4ce14b71b74 (diff) | |
| parent | 6af396a6b6c698eb3834184518fc9a59bc22c817 (diff) | |
Merge branch 'for-rmk/barriers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'include/linux/tick.h')
| -rw-r--r-- | include/linux/tick.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/include/linux/tick.h b/include/linux/tick.h index 9180f4b85e6d..62bd8b72873c 100644 --- a/include/linux/tick.h +++ b/include/linux/tick.h | |||
| @@ -174,10 +174,4 @@ static inline void tick_nohz_task_switch(struct task_struct *tsk) { } | |||
| 174 | #endif | 174 | #endif |
| 175 | 175 | ||
| 176 | 176 | ||
| 177 | # ifdef CONFIG_CPU_IDLE_GOV_MENU | ||
| 178 | extern void menu_hrtimer_cancel(void); | ||
| 179 | # else | ||
| 180 | static inline void menu_hrtimer_cancel(void) {} | ||
| 181 | # endif /* CONFIG_CPU_IDLE_GOV_MENU */ | ||
| 182 | |||
| 183 | #endif | 177 | #endif |