aboutsummaryrefslogtreecommitdiffstats
path: root/arch/ia64
diff options
context:
space:
mode:
Diffstat (limited to 'arch/ia64')
-rw-r--r--arch/ia64/kernel/setup.c8
1 files changed, 7 insertions, 1 deletions
diff --git a/arch/ia64/kernel/setup.c b/arch/ia64/kernel/setup.c
index 5add0bcf87a7..088e5dded8dc 100644
--- a/arch/ia64/kernel/setup.c
+++ b/arch/ia64/kernel/setup.c
@@ -43,6 +43,7 @@
43#include <linux/initrd.h> 43#include <linux/initrd.h>
44#include <linux/platform.h> 44#include <linux/platform.h>
45#include <linux/pm.h> 45#include <linux/pm.h>
46#include <linux/cpufreq.h>
46 47
47#include <asm/ia32.h> 48#include <asm/ia32.h>
48#include <asm/machvec.h> 49#include <asm/machvec.h>
@@ -517,6 +518,7 @@ show_cpuinfo (struct seq_file *m, void *v)
517 char family[32], features[128], *cp, sep; 518 char family[32], features[128], *cp, sep;
518 struct cpuinfo_ia64 *c = v; 519 struct cpuinfo_ia64 *c = v;
519 unsigned long mask; 520 unsigned long mask;
521 unsigned int proc_freq;
520 int i; 522 int i;
521 523
522 mask = c->features; 524 mask = c->features;
@@ -549,6 +551,10 @@ show_cpuinfo (struct seq_file *m, void *v)
549 sprintf(cp, " 0x%lx", mask); 551 sprintf(cp, " 0x%lx", mask);
550 } 552 }
551 553
554 proc_freq = cpufreq_quick_get(cpunum);
555 if (!proc_freq)
556 proc_freq = c->proc_freq / 1000;
557
552 seq_printf(m, 558 seq_printf(m,
553 "processor : %d\n" 559 "processor : %d\n"
554 "vendor : %s\n" 560 "vendor : %s\n"
@@ -565,7 +571,7 @@ show_cpuinfo (struct seq_file *m, void *v)
565 "BogoMIPS : %lu.%02lu\n", 571 "BogoMIPS : %lu.%02lu\n",
566 cpunum, c->vendor, family, c->model, c->revision, c->archrev, 572 cpunum, c->vendor, family, c->model, c->revision, c->archrev,
567 features, c->ppn, c->number, 573 features, c->ppn, c->number,
568 c->proc_freq / 1000000, c->proc_freq % 1000000, 574 proc_freq / 1000, proc_freq % 1000,
569 c->itc_freq / 1000000, c->itc_freq % 1000000, 575 c->itc_freq / 1000000, c->itc_freq % 1000000,
570 lpj*HZ/500000, (lpj*HZ/5000) % 100); 576 lpj*HZ/500000, (lpj*HZ/5000) % 100);
571#ifdef CONFIG_SMP 577#ifdef CONFIG_SMP