diff options
| author | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-21 01:16:16 -0400 |
|---|---|---|
| committer | Paul Gortmaker <paul.gortmaker@windriver.com> | 2017-05-21 01:16:16 -0400 |
| commit | cc45e26acc8e73d85f3da69bdcccb9140407a9db (patch) | |
| tree | 4e8835e1d34d8b95c31f867cf6b9d7c947728fa3 | |
| parent | 6829b5dea439498825b4f63d8cc4b0ee6f42a64e (diff) | |
| download | longterm-queue-4.8-cc45e26acc8e73d85f3da69bdcccb9140407a9db.tar.gz | |
tsc: context refresh as per commit log suggests
Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com>
| -rw-r--r-- | queue/x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/queue/x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch b/queue/x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch index a06c2c2..ee7e8a6 100644 --- a/queue/x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch +++ b/queue/x86-tsc-Fix-ART-for-TSC_KNOWN_FREQ.patch @@ -1,4 +1,4 @@ -From 44fee88cea43d3c2cac962e0439cb10a3cabff6d Mon Sep 17 00:00:00 2001 +From 49a75de019efbaf1d9135266a310b51afddcae0b Mon Sep 17 00:00:00 2001 From: Peter Zijlstra <peterz@infradead.org> Date: Mon, 13 Mar 2017 15:57:12 +0100 Subject: [PATCH] x86/tsc: Fix ART for TSC_KNOWN_FREQ @@ -36,15 +36,16 @@ Cc: john.stultz@linaro.org Cc: akataria@vmware.com Link: http://lkml.kernel.org/r/20170313145712.GI3312@twins.programming.kicks-ass.net Signed-off-by: Thomas Gleixner <tglx@linutronix.de> +Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> diff --git a/arch/x86/kernel/tsc.c b/arch/x86/kernel/tsc.c -index 4f7a9833d8e5..c73a7f9e881a 100644 +index 78b9cb5a26af..899880892a30 100644 --- a/arch/x86/kernel/tsc.c +++ b/arch/x86/kernel/tsc.c -@@ -1333,6 +1333,8 @@ static int __init init_tsc_clocksource(void) - * the refined calibration and directly register it as a clocksource. +@@ -1281,6 +1281,8 @@ static int __init init_tsc_clocksource(void) + * exporting a reliable TSC. */ - if (boot_cpu_has(X86_FEATURE_TSC_KNOWN_FREQ)) { + if (boot_cpu_has(X86_FEATURE_TSC_RELIABLE)) { + if (boot_cpu_has(X86_FEATURE_ART)) + art_related_clocksource = &clocksource_tsc; clocksource_register_khz(&clocksource_tsc, tsc_khz); |