Merge branch 'sched/clock' into tracing/ftrace

Conflicts:
	kernel/sched_clock.c

1 files changed, 10 insertions, 0 deletions

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 426666dd820..7702cb166e0 100644
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -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);