2 files changed, 42 insertions, 19 deletions

diff --git a/arch/ppc64/kernel/cputable.c b/arch/ppc64/kernel/cputable.c
index 4847f2ac8c9f..a20960e47105 100644
--- a/arch/ppc64/kernel/cputable.c
+++ b/arch/ppc64/kernel/cputable.c
@@ -59,6 +59,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
         },
         {       /* Power3+ */
@@ -71,6 +72,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
         },
         {       /* Northstar */
@@ -83,6 +85,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
         },
         {       /* Pulsar */
@@ -95,6 +98,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
         },
         {       /* I-star */
@@ -107,6 +111,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
         },
         {       /* S-star */
@@ -119,6 +124,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power3,
         },
         {       /* Power4 */
@@ -131,6 +137,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power4,
         },
         {       /* Power4+ */
@@ -143,6 +150,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_power4,
         },
         {       /* PPC970 */
@@ -157,6 +165,7 @@ struct cpu_spec	cpu_specs[] = {
                         PPC_FEATURE_HAS_ALTIVEC_COMP,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_ppc970,
         },
         {       /* PPC970FX */
@@ -171,6 +180,7 @@ struct cpu_spec	cpu_specs[] = {
                         PPC_FEATURE_HAS_ALTIVEC_COMP,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 8,
                 .cpu_setup              = __setup_cpu_ppc970,
         },
         {       /* PPC970MP */
@@ -199,6 +209,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 6,
                 .cpu_setup              = __setup_cpu_power4,
         },
         {       /* Power5 */
@@ -213,6 +224,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 6,
                 .cpu_setup              = __setup_cpu_power4,
         },
         {       /* BE DD1.x */
@@ -239,6 +251,7 @@ struct cpu_spec	cpu_specs[] = {
                 .cpu_user_features      = COMMON_USER_PPC64,
                 .icache_bsize           = 128,
                 .dcache_bsize           = 128,
+                .num_pmcs               = 6,
                 .cpu_setup              = __setup_cpu_power4,
         }
 };
diff --git a/arch/ppc64/kernel/sysfs.c b/arch/ppc64/kernel/sysfs.c
index f311ee7c0070..6654b350979c 100644
--- a/arch/ppc64/kernel/sysfs.c
+++ b/arch/ppc64/kernel/sysfs.c
@@ -215,18 +215,23 @@ static void register_cpu_online(unsigned int cpu)
         if (cpu_has_feature(CPU_FTR_MMCRA))
                 sysdev_create_file(s, &attr_mmcra);
 
-        sysdev_create_file(s, &attr_pmc1);
-        sysdev_create_file(s, &attr_pmc2);
-        sysdev_create_file(s, &attr_pmc3);
-        sysdev_create_file(s, &attr_pmc4);
-        sysdev_create_file(s, &attr_pmc5);
-        sysdev_create_file(s, &attr_pmc6);
-
-        if (cpu_has_feature(CPU_FTR_PMC8)) {
+        if (cur_cpu_spec->num_pmcs >= 1)
+                sysdev_create_file(s, &attr_pmc1);
+        if (cur_cpu_spec->num_pmcs >= 2)
+                sysdev_create_file(s, &attr_pmc2);
+        if (cur_cpu_spec->num_pmcs >= 3)
+                sysdev_create_file(s, &attr_pmc3);
+        if (cur_cpu_spec->num_pmcs >= 4)
+                sysdev_create_file(s, &attr_pmc4);
+        if (cur_cpu_spec->num_pmcs >= 5)
+                sysdev_create_file(s, &attr_pmc5);
+        if (cur_cpu_spec->num_pmcs >= 6)
+                sysdev_create_file(s, &attr_pmc6);
+        if (cur_cpu_spec->num_pmcs >= 7)
                 sysdev_create_file(s, &attr_pmc7);
+        if (cur_cpu_spec->num_pmcs >= 8)
                 sysdev_create_file(s, &attr_pmc8);
-        }
-
+  
         if (cpu_has_feature(CPU_FTR_SMT))
                 sysdev_create_file(s, &attr_purr);
 }
@@ -252,17 +257,22 @@ static void unregister_cpu_online(unsigned int cpu)
         if (cpu_has_feature(CPU_FTR_MMCRA))
                 sysdev_remove_file(s, &attr_mmcra);
 
-        sysdev_remove_file(s, &attr_pmc1);
-        sysdev_remove_file(s, &attr_pmc2);
-        sysdev_remove_file(s, &attr_pmc3);
-        sysdev_remove_file(s, &attr_pmc4);
-        sysdev_remove_file(s, &attr_pmc5);
-        sysdev_remove_file(s, &attr_pmc6);
-
-        if (cpu_has_feature(CPU_FTR_PMC8)) {
+        if (cur_cpu_spec->num_pmcs >= 1)
+                sysdev_remove_file(s, &attr_pmc1);
+        if (cur_cpu_spec->num_pmcs >= 2)
+                sysdev_remove_file(s, &attr_pmc2);
+        if (cur_cpu_spec->num_pmcs >= 3)
+                sysdev_remove_file(s, &attr_pmc3);
+        if (cur_cpu_spec->num_pmcs >= 4)
+                sysdev_remove_file(s, &attr_pmc4);
+        if (cur_cpu_spec->num_pmcs >= 5)
+                sysdev_remove_file(s, &attr_pmc5);
+        if (cur_cpu_spec->num_pmcs >= 6)
+                sysdev_remove_file(s, &attr_pmc6);
+        if (cur_cpu_spec->num_pmcs >= 7)
                 sysdev_remove_file(s, &attr_pmc7);
+        if (cur_cpu_spec->num_pmcs >= 8)
                 sysdev_remove_file(s, &attr_pmc8);
-        }
 
         if (cpu_has_feature(CPU_FTR_SMT))
                 sysdev_remove_file(s, &attr_purr);