aboutsummaryrefslogtreecommitdiffstats
path: root/arch/x86/kernel/cpu/proc.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/x86/kernel/cpu/proc.c')
-rw-r--r--arch/x86/kernel/cpu/proc.c10
1 files changed, 2 insertions, 8 deletions
diff --git a/arch/x86/kernel/cpu/proc.c b/arch/x86/kernel/cpu/proc.c
index 6df621ae62a7..218f79825b3c 100644
--- a/arch/x86/kernel/cpu/proc.c
+++ b/arch/x86/kernel/cpu/proc.c
@@ -2,7 +2,6 @@
2#include <linux/timex.h> 2#include <linux/timex.h>
3#include <linux/string.h> 3#include <linux/string.h>
4#include <linux/seq_file.h> 4#include <linux/seq_file.h>
5#include <linux/cpufreq.h>
6 5
7/* 6/*
8 * Get CPU information for use by the procfs. 7 * Get CPU information for use by the procfs.
@@ -76,14 +75,9 @@ static int show_cpuinfo(struct seq_file *m, void *v)
76 if (c->microcode) 75 if (c->microcode)
77 seq_printf(m, "microcode\t: 0x%x\n", c->microcode); 76 seq_printf(m, "microcode\t: 0x%x\n", c->microcode);
78 77
79 if (cpu_has(c, X86_FEATURE_TSC)) { 78 if (cpu_has(c, X86_FEATURE_TSC))
80 unsigned int freq = cpufreq_quick_get(cpu);
81
82 if (!freq)
83 freq = cpu_khz;
84 seq_printf(m, "cpu MHz\t\t: %u.%03u\n", 79 seq_printf(m, "cpu MHz\t\t: %u.%03u\n",
85 freq / 1000, (freq % 1000)); 80 cpu_khz / 1000, (cpu_khz % 1000));
86 }
87 81
88 /* Cache size */ 82 /* Cache size */
89 if (c->x86_cache_size >= 0) 83 if (c->x86_cache_size >= 0)