diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-06 00:43:03 +0200 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2017-04-06 00:43:03 +0200 |
| commit | 3872fe83a2fbb7366daa93ca533a22138e2d483e (patch) | |
| tree | e9c7c7a4a09a551011286a866235594b76cb73af /arch/x86/kernel/cpu/common.c | |
| parent | ARM: 8665/1: nommu: access ID_PFR1 only if CPUID scheme (diff) | |
| parent | arm: kprobes: Align stack to 8-bytes in test code (diff) | |
| download | linux-3872fe83a2fbb7366daa93ca533a22138e2d483e.tar.xz linux-3872fe83a2fbb7366daa93ca533a22138e2d483e.zip | |
Merge branch 'kprobe-fixes' of https://git.linaro.org/people/tixy/kernel into fixes
Diffstat (limited to 'arch/x86/kernel/cpu/common.c')
| -rw-r--r-- | arch/x86/kernel/cpu/common.c | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/x86/kernel/cpu/common.c b/arch/x86/kernel/cpu/common.c index b11b38c3b0bd..58094a1f9e9d 100644 --- a/arch/x86/kernel/cpu/common.c +++ b/arch/x86/kernel/cpu/common.c @@ -88,7 +88,6 @@ static void default_init(struct cpuinfo_x86 *c) strcpy(c->x86_model_id, "386"); } #endif - clear_sched_clock_stable(); } static const struct cpu_dev default_cpu = { @@ -1077,8 +1076,6 @@ static void identify_cpu(struct cpuinfo_x86 *c) */ if (this_cpu->c_init) this_cpu->c_init(c); - else - clear_sched_clock_stable(); /* Disable the PN if appropriate */ squash_the_stupid_serial_number(c); |