diff options
| author | Tony Luck <tony.luck@intel.com> | 2006-01-05 08:52:11 -0800 |
|---|---|---|
| committer | Tony Luck <tony.luck@intel.com> | 2006-01-05 08:52:11 -0800 |
| commit | 5c3eee79128c372a81a83665be2332a000944280 (patch) | |
| tree | e44331d36d63adc971003cc32540d0cb0c019525 /arch/x86_64/kernel/setup.c | |
| parent | 408045afbdb46e109a1a44e67af688e9ddf7ad66 (diff) | |
| parent | db9edfd7e339ca4113153d887e782dd05be5a9eb (diff) | |
| download | kernel_goldelico_gta04-5c3eee79128c372a81a83665be2332a000944280.zip kernel_goldelico_gta04-5c3eee79128c372a81a83665be2332a000944280.tar.gz kernel_goldelico_gta04-5c3eee79128c372a81a83665be2332a000944280.tar.bz2 | |
Auto-update from upstream
Diffstat (limited to 'arch/x86_64/kernel/setup.c')
| -rw-r--r-- | arch/x86_64/kernel/setup.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c index 750e01d..64c4534 100644 --- a/arch/x86_64/kernel/setup.c +++ b/arch/x86_64/kernel/setup.c @@ -42,6 +42,7 @@ #include <linux/edd.h> #include <linux/mmzone.h> #include <linux/kexec.h> +#include <linux/cpufreq.h> #include <asm/mtrr.h> #include <asm/uaccess.h> @@ -1256,8 +1257,11 @@ static int show_cpuinfo(struct seq_file *m, void *v) seq_printf(m, "stepping\t: unknown\n"); if (cpu_has(c,X86_FEATURE_TSC)) { + unsigned int freq = cpufreq_quick_get((unsigned)(c-cpu_data)); + if (!freq) + freq = cpu_khz; seq_printf(m, "cpu MHz\t\t: %u.%03u\n", - cpu_khz / 1000, (cpu_khz % 1000)); + freq / 1000, (freq % 1000)); } /* Cache size */ |