summaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/cyrix.c
diff options
context:
space:
mode:
authorIngo Molnar <mingo@kernel.org>2017-03-16 09:50:50 +0100
committerIngo Molnar <mingo@kernel.org>2017-03-16 09:50:50 +0100
commit2b95bd7d58d368fe5dcbe6f4e494847ea082d89d (patch)
tree48c38d792f31f2fe10b26b03bdf1b10a82ca03a4 /arch/x86/kernel/cpu/cyrix.c
parentMerge tag 'perf-core-for-mingo-4.12-20170314' of git://git.kernel.org/pub/scm... (diff)
parentMerge branch 'for-linus' of git://git.kernel.dk/linux-block (diff)
downloadlinux-2b95bd7d58d368fe5dcbe6f4e494847ea082d89d.tar.xz
linux-2b95bd7d58d368fe5dcbe6f4e494847ea082d89d.zip
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'arch/x86/kernel/cpu/cyrix.c')
-rw-r--r--arch/x86/kernel/cpu/cyrix.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/arch/x86/kernel/cpu/cyrix.c b/arch/x86/kernel/cpu/cyrix.c
index 0a3bc19de017..a70fd61095f8 100644
--- a/arch/x86/kernel/cpu/cyrix.c
+++ b/arch/x86/kernel/cpu/cyrix.c
@@ -185,7 +185,6 @@ static void early_init_cyrix(struct cpuinfo_x86 *c)
set_cpu_cap(c, X86_FEATURE_CYRIX_ARR);
break;
}
- clear_sched_clock_stable();
}
static void init_cyrix(struct cpuinfo_x86 *c)