powerpc adjust oprofile_cpu_type version 3

Oprofile is changing the naming it is using for the compatibility modes.
Instead of having compat-power<x>, oprofile will go to family naming
convention and use ibm-compat-v<x>.  Currently only ibm-compat-v1 will
be defined.
The notion of compatibility events just started with POWER6. So there is
no way that any other tool could exist that is using these
oprofile_cpu_type strings we want to change.

Signed-off-by: Mike Wolf <mjw@linux.vnet.ibm.com>
Signed-off-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>

1 files changed, 9 insertions, 4 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index cd1b687544f3..5e925dbffbfb 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -382,7 +382,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .machine_check          = machine_check_generic,
-                .oprofile_cpu_type      = "ppc64/compat-power5+",
+                .oprofile_cpu_type      = "ppc64/ibm-compat-v1",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
                 .platform               = "power5+",
         },
         {       /* Power6 */
@@ -416,7 +417,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .machine_check          = machine_check_generic,
-                .oprofile_cpu_type      = "ppc64/compat-power6",
+                .oprofile_cpu_type      = "ppc64/ibm-compat-v1",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
                 .platform               = "power6",
         },
         {       /* 2.06-compliant processor, i.e. Power7 "architected" mode */
@@ -429,7 +431,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
                 .machine_check          = machine_check_generic,
-                .oprofile_cpu_type      = "ppc64/compat-power7",
+                .oprofile_type          = PPC_OPROFILE_POWER4,
+                .oprofile_cpu_type      = "ppc64/ibm-compat-v1",
                 .platform               = "power7",
         },
         {       /* Power7 */
@@ -1833,8 +1836,10 @@ static void __init setup_cpu_spec(unsigned long offset, struct cpu_spec *s)
                  * and, in that case, keep the current value for
                  * oprofile_cpu_type.
                  */
-                if (old.oprofile_cpu_type == NULL)
+                if (old.oprofile_cpu_type == NULL) {
                         t->oprofile_cpu_type = s->oprofile_cpu_type;
+                        t->oprofile_type = s->oprofile_type;
+                }
         }
 
         *PTRRELOC(&cur_cpu_spec) = &the_cpu_spec;