forge/linux-pinenote
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'sched/clock' into tracing/ftrace

Browse source 
Conflicts:
	kernel/sched_clock.c
This commit is contained in:
Ingo Molnar 2009-02-26 21:21:59 +01:00
commit 1b49061d40
3 changed files with 40 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

10
include/linux/sched.h
View file

@ -1672,6 +1672,16 @@ static inline int set_cpus_allowed(struct task_struct *p, cpumask_t new_mask)
return set_cpus_allowed_ptr(p, &new_mask);
}
/*
* Architectures can set this to 1 if they have specified
* CONFIG_HAVE_UNSTABLE_SCHED_CLOCK in their arch Kconfig,
* but then during bootup it turns out that sched_clock()
* is reliable after all:
*/
#ifdef CONFIG_HAVE_UNSTABLE_SCHED_CLOCK
extern int sched_clock_stable;
#endif
extern unsigned long long sched_clock(void);
extern void sched_clock_init(void);