nagai/kernel
3
0
Fork 0
forked from mirrors/linux
Code Pull requests Activity

Revert "x86: do not use cpufreq_quick_get() for /proc/cpuinfo "cpu MHz""

Browse source 
This reverts commit 51204e0639.

There wasn't really any good reason for it, and people are complaining
(rightly) that it broke existing practice.

Cc: Len Brown <len.brown@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Linus Torvalds 2017-11-02 14:06:32 -07:00
parent 6daa083923
commit 890da9cf09
1 changed files with 8 additions and 2 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/kernel/cpu/proc.c
View file

@ -3,6 +3,7 @@
#include <linux/timex.h> #include <linux/timex.h>
#include <linux/string.h> #include <linux/string.h>
#include <linux/seq_file.h> #include <linux/seq_file.h>
#include <linux/cpufreq.h>
/* /*
* Get CPU information for use by the procfs. * Get CPU information for use by the procfs.
@ -76,9 +77,14 @@ static int show_cpuinfo(struct seq_file *m, void *v)
if (c->microcode) if (c->microcode)
seq_printf(m, "microcode\t: 0x%x\n", c->microcode); seq_printf(m, "microcode\t: 0x%x\n", c->microcode);
if (cpu_has(c, X86_FEATURE_TSC)) if (cpu_has(c, X86_FEATURE_TSC)) {
unsigned int freq = cpufreq_quick_get(cpu);
if (!freq)
freq = cpu_khz;
seq_printf(m, "cpu MHz\t\t: %u.%03u\n", seq_printf(m, "cpu MHz\t\t: %u.%03u\n",
cpu_khz / 1000, (cpu_khz % 1000)); freq / 1000, (freq % 1000));
}
/* Cache size */ /* Cache size */
if (c->x86_cache_size >= 0) if (c->x86_cache_size >= 0)