diff options
| author | Ingo Molnar <mingo@elte.hu> | 2008-08-12 00:07:02 +0200 |
|---|---|---|
| committer | Ingo Molnar <mingo@elte.hu> | 2008-08-12 00:07:02 +0200 |
| commit | e26b33e9552c29c1d3fe67dc602c6264c29f5dc7 (patch) | |
| tree | 98f99cedc86db77665d1a3b582444b9049aacc58 /include/linux | |
| parent | 279ef6bbb8308488398c8f33b04c760148428378 (diff) | |
| parent | cf206bffbb7542df54043fad9898113172af99d8 (diff) | |
Merge branch 'sched/clock' into sched/urgent
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sched.h | 31 |
1 files changed, 4 insertions, 27 deletions
diff --git a/include/linux/sched.h b/include/linux/sched.h index 5270d449ff9..5850bfb968a 100644 --- a/include/linux/sched.h +++ b/include/linux/sched.h @@ -1551,16 +1551,10 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask) extern unsigned long long sched_clock(void); -#ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK -static inline void sched_clock_init(void) -{ -} - -static inline u64 sched_clock_cpu(int cpu) -{ - return sched_clock(); -} +extern void sched_clock_init(void); +extern u64 sched_clock_cpu(int cpu); +#ifndef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK static inline void sched_clock_tick(void) { } @@ -1572,28 +1566,11 @@ static inline void sched_clock_idle_sleep_event(void) static inline void sched_clock_idle_wakeup_event(u64 delta_ns) { } - -#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); +#else 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 |