diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 06:30:57 -0400 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-10-09 06:30:57 -0400 |
commit | afa3536be88b435a057cb727b48fd3d760a497d2 (patch) | |
tree | 8562d3c8327286746ae835ef8eb39d4494a1054d /kernel/time/tick-internal.h | |
parent | 35a9ad8af0bb0fa3525e6d0d20e32551d226f38e (diff) | |
parent | 9b01f5bf3999a3db5b1bbd9fdfd80d8d304e94ee (diff) |
Merge branch 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull timer fixes from Ingo Molnar:
"Main changes:
- Fix the deadlock reported by Dave Jones et al
- Clean up and fix nohz_full interaction with arch abilities
- nohz init code consolidation/cleanup"
* 'timers-nohz-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
nohz: nohz full depends on irq work self IPI support
nohz: Consolidate nohz full init code
arm64: Tell irq work about self IPI support
arm: Tell irq work about self IPI support
x86: Tell irq work about self IPI support
irq_work: Force raised irq work to run on irq work interrupt
irq_work: Introduce arch_irq_work_has_interrupt()
nohz: Move nohz full init call to tick init
Diffstat (limited to 'kernel/time/tick-internal.h')
-rw-r--r-- | kernel/time/tick-internal.h | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/kernel/time/tick-internal.h b/kernel/time/tick-internal.h index c19c1d84b6f3..366aeb4f2c66 100644 --- a/kernel/time/tick-internal.h +++ b/kernel/time/tick-internal.h | |||
@@ -99,6 +99,13 @@ static inline int tick_broadcast_oneshot_active(void) { return 0; } | |||
99 | static inline bool tick_broadcast_oneshot_available(void) { return false; } | 99 | static inline bool tick_broadcast_oneshot_available(void) { return false; } |
100 | #endif /* !TICK_ONESHOT */ | 100 | #endif /* !TICK_ONESHOT */ |
101 | 101 | ||
102 | /* NO_HZ_FULL internal */ | ||
103 | #ifdef CONFIG_NO_HZ_FULL | ||
104 | extern void tick_nohz_init(void); | ||
105 | # else | ||
106 | static inline void tick_nohz_init(void) { } | ||
107 | #endif | ||
108 | |||
102 | /* | 109 | /* |
103 | * Broadcasting support | 110 | * Broadcasting support |
104 | */ | 111 | */ |