diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 09:51:49 -0500 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2013-02-04 09:51:49 -0500 |
| commit | 2fb20e2e35cd1455d022ab7a553d7f1663ffbdeb (patch) | |
| tree | 4b3bb0f76c15264fe7d4cced91127f3d96ff31f5 /include/linux/clockchips.h | |
| parent | 9cb543124a2d31af42ce61a4c30765ecc8e5f1fa (diff) | |
| parent | 5b91ab0abc957145c3ff6be03eb9a3901797019f (diff) | |
Merge branch 'for-rmk/broadcast' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into devel-stable
Diffstat (limited to 'include/linux/clockchips.h')
| -rw-r--r-- | include/linux/clockchips.h | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/include/linux/clockchips.h b/include/linux/clockchips.h index 8a7096fcb01e..66346521cb65 100644 --- a/include/linux/clockchips.h +++ b/include/linux/clockchips.h | |||
| @@ -161,6 +161,15 @@ clockevents_calc_mult_shift(struct clock_event_device *ce, u32 freq, u32 minsec) | |||
| 161 | extern void clockevents_suspend(void); | 161 | extern void clockevents_suspend(void); |
| 162 | extern void clockevents_resume(void); | 162 | extern void clockevents_resume(void); |
| 163 | 163 | ||
| 164 | #ifdef CONFIG_GENERIC_CLOCKEVENTS_BROADCAST | ||
| 165 | #ifdef CONFIG_ARCH_HAS_TICK_BROADCAST | ||
| 166 | extern void tick_broadcast(const struct cpumask *mask); | ||
| 167 | #else | ||
| 168 | #define tick_broadcast NULL | ||
| 169 | #endif | ||
| 170 | extern int tick_receive_broadcast(void); | ||
| 171 | #endif | ||
| 172 | |||
| 164 | #ifdef CONFIG_GENERIC_CLOCKEVENTS | 173 | #ifdef CONFIG_GENERIC_CLOCKEVENTS |
| 165 | extern void clockevents_notify(unsigned long reason, void *arg); | 174 | extern void clockevents_notify(unsigned long reason, void *arg); |
| 166 | #else | 175 | #else |