From: Anton Blanchard Date: Mon, 9 Jan 2006 04:42:30 +0000 (+1100) Subject: [PATCH] ppc64: POWER5+ oprofile support X-Git-Tag: v2.6.16-rc1~666^2~4 X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=834608f71a323b90f928d05c64d24df436df3011;p=linux-2.6-omap-h63xx.git [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 Signed-off-by: Paul Mackerras --- diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c index 2a16f4a192e..43c74a6b07b 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 */