diff options
| author | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:21:26 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@g5.osdl.org> | 2006-01-04 16:21:26 -0800 |
| commit | 0356dbb7fe87ba59558902e536d9f960e87353c1 (patch) | |
| tree | 2cb23f809c838f0bd7406845ea0a8e7cb5875c99 /arch/x86_64 | |
| parent | e28cc71572da38a5a12c1cfe4d7032017adccf69 (diff) | |
| parent | 95235ca2c20ac0b31a8eb39e2d599bcc3e9c9a10 (diff) | |
| download | op-kernel-dev-0356dbb7fe87ba59558902e536d9f960e87353c1.zip op-kernel-dev-0356dbb7fe87ba59558902e536d9f960e87353c1.tar.gz | |
Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq
Diffstat (limited to 'arch/x86_64')
| -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 */ |
