summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorAnton Blanchard <anton@samba.org>2006-01-09 15:42:30 +1100
committerPaul Mackerras <paulus@samba.org>2006-01-09 16:03:30 +1100
commit834608f71a323b90f928d05c64d24df436df3011 (patch)
treef5da5366383da7d83efe18532b3e5e4eeaeb4567 /arch
parent32a33994d513606d29e87e152deb67ba5f3c8e82 (diff)
downloadlinux-834608f71a323b90f928d05c64d24df436df3011.tar.bz2
[PATCH] ppc64: POWER5+ oprofile support
POWER5+ adds new PMU groups and as such needs to be treated differently by oprofile userspace. Change it to report itself as power5+. Signed-off-by: Anton Blanchard <anton@samba.org> Signed-off-by: Paul Mackerras <paulus@samba.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/powerpc/kernel/cputable.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index 2a16f4a192ee..43c74a6b07b1 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -237,14 +237,14 @@ struct cpu_spec cpu_specs[] = {
{ /* Power5 GS */
.pvr_mask = 0xffff0000,
.pvr_value = 0x003b0000,
- .cpu_name = "POWER5 (gs)",
+ .cpu_name = "POWER5+ (gs)",
.cpu_features = CPU_FTRS_POWER5,
.cpu_user_features = COMMON_USER_POWER5_PLUS,
.icache_bsize = 128,
.dcache_bsize = 128,
.num_pmcs = 6,
.cpu_setup = __setup_cpu_power4,
- .oprofile_cpu_type = "ppc64/power5",
+ .oprofile_cpu_type = "ppc64/power5+",
.oprofile_type = POWER4,
},
{ /* Cell Broadband Engine */