summaryrefslogtreecommitdiffstats
path: root/arch/x86/include/asm/timer.h
diff options
context:
space:
mode:
authorPeter Zijlstra <peterz@infradead.org>2017-03-17 12:48:18 +0100
committerIngo Molnar <mingo@kernel.org>2017-03-23 07:31:49 +0100
commit698eff6355f735d46d1b7113df8b422874cd7988 (patch)
tree77a7207a64ac5c8b87844bc4e91f551bf4102275 /arch/x86/include/asm/timer.h
parent71fdb70eb48784c1f28cdf2e67c4c587dd7f2594 (diff)
downloadlinux-0-day-698eff6355f735d46d1b7113df8b422874cd7988.tar.gz
linux-0-day-698eff6355f735d46d1b7113df8b422874cd7988.tar.xz
sched/clock, x86/perf: Fix "perf test tsc"
People reported that commit: 5680d8094ffa ("sched/clock: Provide better clock continuity") broke "perf test tsc". That commit added another offset to the reported clock value; so take that into account when computing the provided offset values. Reported-by: Adrian Hunter <adrian.hunter@intel.com> Reported-by: Arnaldo Carvalho de Melo <acme@kernel.org> Tested-by: Alexander Shishkin <alexander.shishkin@linux.intel.com> Signed-off-by: Peter Zijlstra (Intel) <peterz@infradead.org> Cc: Linus Torvalds <torvalds@linux-foundation.org> Cc: Mike Galbraith <efault@gmx.de> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Thomas Gleixner <tglx@linutronix.de> Fixes: 5680d8094ffa ("sched/clock: Provide better clock continuity") Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/include/asm/timer.h')
-rw-r--r--arch/x86/include/asm/timer.h2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/x86/include/asm/timer.h b/arch/x86/include/asm/timer.h
index a04eabd43d066..27e9f9d769b89 100644
--- a/arch/x86/include/asm/timer.h
+++ b/arch/x86/include/asm/timer.h
@@ -12,6 +12,8 @@ extern int recalibrate_cpu_khz(void);
extern int no_timer_check;
+extern bool using_native_sched_clock(void);
+
/*
* We use the full linear equation: f(x) = a + b*x, in order to allow
* a continuous function in the face of dynamic freq changes.