diff options
author | Anton Blanchard <anton@samba.org> | 2006-01-08 23:42:30 -0500 |
---|---|---|
committer | Paul Mackerras <paulus@samba.org> | 2006-01-09 00:03:30 -0500 |
commit | 834608f71a323b90f928d05c64d24df436df3011 (patch) | |
tree | f5da5366383da7d83efe18532b3e5e4eeaeb4567 /arch | |
parent | 32a33994d513606d29e87e152deb67ba5f3c8e82 (diff) |
[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.c | 4 |
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[] = { | |||
237 | { /* Power5 GS */ | 237 | { /* Power5 GS */ |
238 | .pvr_mask = 0xffff0000, | 238 | .pvr_mask = 0xffff0000, |
239 | .pvr_value = 0x003b0000, | 239 | .pvr_value = 0x003b0000, |
240 | .cpu_name = "POWER5 (gs)", | 240 | .cpu_name = "POWER5+ (gs)", |
241 | .cpu_features = CPU_FTRS_POWER5, | 241 | .cpu_features = CPU_FTRS_POWER5, |
242 | .cpu_user_features = COMMON_USER_POWER5_PLUS, | 242 | .cpu_user_features = COMMON_USER_POWER5_PLUS, |
243 | .icache_bsize = 128, | 243 | .icache_bsize = 128, |
244 | .dcache_bsize = 128, | 244 | .dcache_bsize = 128, |
245 | .num_pmcs = 6, | 245 | .num_pmcs = 6, |
246 | .cpu_setup = __setup_cpu_power4, | 246 | .cpu_setup = __setup_cpu_power4, |
247 | .oprofile_cpu_type = "ppc64/power5", | 247 | .oprofile_cpu_type = "ppc64/power5+", |
248 | .oprofile_type = POWER4, | 248 | .oprofile_type = POWER4, |
249 | }, | 249 | }, |
250 | { /* Cell Broadband Engine */ | 250 | { /* Cell Broadband Engine */ |