projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'x86/doc' into x86/core
[cascardo/linux.git]
/
arch
/
sparc
/
kernel
/
setup_64.c
diff --git
a/arch/sparc/kernel/setup_64.c
b/arch/sparc/kernel/setup_64.c
index
49d061f
..
f2bcfd2
100644
(file)
--- a/
arch/sparc/kernel/setup_64.c
+++ b/
arch/sparc/kernel/setup_64.c
@@
-354,6
+354,7
@@
static int show_cpuinfo(struct seq_file *m, void *__unused)
seq_printf(m,
"cpu\t\t: %s\n"
"fpu\t\t: %s\n"
+ "pmu\t\t: %s\n"
"prom\t\t: %s\n"
"type\t\t: %s\n"
"ncpus probed\t: %d\n"
@@
-366,6
+367,7
@@
static int show_cpuinfo(struct seq_file *m, void *__unused)
,
sparc_cpu_type,
sparc_fpu_type,
+ sparc_pmu_type,
prom_version,
((tlb_type == hypervisor) ?
"sun4v" :