Merge master.kernel.org:/pub/scm/linux/kernel/git/davej/cpufreq

1 files changed, 5 insertions, 1 deletions

diff --git a/arch/x86_64/kernel/setup.c b/arch/x86_64/kernel/setup.c
index 750e01dcbdf4..64c4534b930c 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 */