git://git.onelab.eu
/
linux-2.6.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
VServer 1.9.2 (patch-2.6.8.1-vs1.9.2.diff)
[linux-2.6.git]
/
arch
/
ppc64
/
oprofile
/
common.c
diff --git
a/arch/ppc64/oprofile/common.c
b/arch/ppc64/oprofile/common.c
index
95e824b
..
391e9af
100644
(file)
--- a/
arch/ppc64/oprofile/common.c
+++ b/
arch/ppc64/oprofile/common.c
@@
-154,13
+154,15
@@
int __init oprofile_arch_init(struct oprofile_operations **ops)
oprof_ppc64_ops.cpu_type = "ppc64/power4";
break;
oprof_ppc64_ops.cpu_type = "ppc64/power4";
break;
- case PV_GPUL:
+ case PV_970:
+ case PV_970FX:
model = &op_model_power4;
model->num_counters = 8;
oprof_ppc64_ops.cpu_type = "ppc64/970";
break;
case PV_POWER5:
model = &op_model_power4;
model->num_counters = 8;
oprof_ppc64_ops.cpu_type = "ppc64/970";
break;
case PV_POWER5:
+ case PV_POWER5p:
model = &op_model_power4;
model->num_counters = 6;
oprof_ppc64_ops.cpu_type = "ppc64/power5";
model = &op_model_power4;
model->num_counters = 6;
oprof_ppc64_ops.cpu_type = "ppc64/power5";