diff options
| author | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-02 16:33:48 +0200 |
|---|---|---|
| committer | Al Viro <viro@zeniv.linux.org.uk> | 2017-04-02 16:33:48 +0200 |
| commit | bee3f412d6fc94011850f16cddce745d529411a5 (patch) | |
| tree | 01b1823a3bc0cb760129ed15f7ec027a36edc48b /arch/x86/kernel/cpu/cyrix.c | |
| parent | generic ...copy_..._user primitives (diff) | |
| parent | parisc: Avoid stalled CPU warnings after system shutdown (diff) | |
| download | linux-bee3f412d6fc94011850f16cddce745d529411a5.tar.xz linux-bee3f412d6fc94011850f16cddce745d529411a5.zip | |
Merge branch 'parisc-4.11-3' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux into uaccess.parisc
Diffstat (limited to 'arch/x86/kernel/cpu/cyrix.c')
| -rw-r--r-- | arch/x86/kernel/cpu/cyrix.c | 1 |
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) |