diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-07-14 12:19:13 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-07-14 12:19:13 +0200 |
| commit | 361833efac4d277d209008e1e0658e597bc1bdef (patch) | |
| tree | ef3b3f3bbe274f1e59cc1521566a85584777ace7 /include | |
| parent | 54ef76f37bcccf8c16fbaaed13c3c40825195958 (diff) | |
| parent | c300ba252829e9325e08f0af60687add94445b25 (diff) | |
Merge branch 'sched/clock' into sched/devel
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/sched.h | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 835b6c6fcc56..f6cd60f2de63 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1558,13 +1558,28 @@ static inline void sched_clock_idle_sleep_event(void) static inline void sched_clock_idle_wakeup_event(u64 delta_ns) { } -#else + +#ifdef CONFIG_NO_HZ +static inline void sched_clock_tick_stop(int cpu) +{ +} + +static inline void sched_clock_tick_start(int cpu) +{ +} +#endif + +#else /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ extern void sched_clock_init(void); extern u64 sched_clock_cpu(int cpu); extern void sched_clock_tick(void); extern void sched_clock_idle_sleep_event(void); extern void sched_clock_idle_wakeup_event(u64 delta_ns); +#ifdef CONFIG_NO_HZ +extern void sched_clock_tick_stop(int cpu); +extern void sched_clock_tick_start(int cpu); #endif +#endif /* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK */ /* * For kernel-internal use: high-speed (but slightly incorrect) per-cpu |