2 files changed, 44 insertions, 14 deletions

diff --git a/arch/powerpc/oprofile/common.c b/arch/powerpc/oprofile/common.c
index 4f51025f5b00..c77348c5d463 100644
--- a/arch/powerpc/oprofile/common.c
+++ b/arch/powerpc/oprofile/common.c
@@ -119,7 +119,7 @@ static void op_powerpc_stop(void)
                 model->global_stop();
 }
 
-static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
+static int op_powerpc_create_files(struct dentry *root)
 {
         int i;
 
@@ -128,9 +128,9 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
          * There is one mmcr0, mmcr1 and mmcra for setting the events for
          * all of the counters.
          */
-        oprofilefs_create_ulong(sb, root, "mmcr0", &sys.mmcr0);
-        oprofilefs_create_ulong(sb, root, "mmcr1", &sys.mmcr1);
-        oprofilefs_create_ulong(sb, root, "mmcra", &sys.mmcra);
+        oprofilefs_create_ulong(root, "mmcr0", &sys.mmcr0);
+        oprofilefs_create_ulong(root, "mmcr1", &sys.mmcr1);
+        oprofilefs_create_ulong(root, "mmcra", &sys.mmcra);
 #ifdef CONFIG_OPROFILE_CELL
         /* create a file the user tool can check to see what level of profiling
          * support exits with this kernel. Initialize bit mask to indicate
@@ -142,7 +142,7 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
          * If the file does not exist, then the kernel only supports SPU
          * cycle profiling, PPU event and cycle profiling.
          */
-        oprofilefs_create_ulong(sb, root, "cell_support", &sys.cell_support);
+        oprofilefs_create_ulong(root, "cell_support", &sys.cell_support);
         sys.cell_support = 0x1; /* Note, the user OProfile tool must check
                                  * that this bit is set before attempting to
                                  * user SPU event profiling.  Older kernels
@@ -160,11 +160,11 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
                 char buf[4];
 
                 snprintf(buf, sizeof buf, "%d", i);
-                dir = oprofilefs_mkdir(sb, root, buf);
+                dir = oprofilefs_mkdir(root, buf);
 
-                oprofilefs_create_ulong(sb, dir, "enabled", &ctr[i].enabled);
-                oprofilefs_create_ulong(sb, dir, "event", &ctr[i].event);
-                oprofilefs_create_ulong(sb, dir, "count", &ctr[i].count);
+                oprofilefs_create_ulong(dir, "enabled", &ctr[i].enabled);
+                oprofilefs_create_ulong(dir, "event", &ctr[i].event);
+                oprofilefs_create_ulong(dir, "count", &ctr[i].count);
 
                 /*
                  * Classic PowerPC doesn't support per-counter
@@ -173,14 +173,14 @@ static int op_powerpc_create_files(struct super_block *sb, struct dentry *root)
                  * Book-E style performance monitors, we do
                  * support them.
                  */
-                oprofilefs_create_ulong(sb, dir, "kernel", &ctr[i].kernel);
-                oprofilefs_create_ulong(sb, dir, "user", &ctr[i].user);
+                oprofilefs_create_ulong(dir, "kernel", &ctr[i].kernel);
+                oprofilefs_create_ulong(dir, "user", &ctr[i].user);
 
-                oprofilefs_create_ulong(sb, dir, "unit_mask", &ctr[i].unit_mask);
+                oprofilefs_create_ulong(dir, "unit_mask", &ctr[i].unit_mask);
         }
 
-        oprofilefs_create_ulong(sb, root, "enable_kernel", &sys.enable_kernel);
-        oprofilefs_create_ulong(sb, root, "enable_user", &sys.enable_user);
+        oprofilefs_create_ulong(root, "enable_kernel", &sys.enable_kernel);
+        oprofilefs_create_ulong(root, "enable_user", &sys.enable_user);
 
         /* Default to tracing both kernel and user */
         sys.enable_kernel = 1;
diff --git a/arch/powerpc/oprofile/op_model_fsl_emb.c b/arch/powerpc/oprofile/op_model_fsl_emb.c
index ccc1daa33aed..2a82d3ed464d 100644
--- a/arch/powerpc/oprofile/op_model_fsl_emb.c
+++ b/arch/powerpc/oprofile/op_model_fsl_emb.c
@@ -46,6 +46,12 @@ static inline u32 get_pmlca(int ctr)
                 case 3:
                         pmlca = mfpmr(PMRN_PMLCA3);
                         break;
+                case 4:
+                        pmlca = mfpmr(PMRN_PMLCA4);
+                        break;
+                case 5:
+                        pmlca = mfpmr(PMRN_PMLCA5);
+                        break;
                 default:
                         panic("Bad ctr number\n");
         }
@@ -68,6 +74,12 @@ static inline void set_pmlca(int ctr, u32 pmlca)
                 case 3:
                         mtpmr(PMRN_PMLCA3, pmlca);
                         break;
+                case 4:
+                        mtpmr(PMRN_PMLCA4, pmlca);
+                        break;
+                case 5:
+                        mtpmr(PMRN_PMLCA5, pmlca);
+                        break;
                 default:
                         panic("Bad ctr number\n");
         }
@@ -84,6 +96,10 @@ static inline unsigned int ctr_read(unsigned int i)
                         return mfpmr(PMRN_PMC2);
                 case 3:
                         return mfpmr(PMRN_PMC3);
+                case 4:
+                        return mfpmr(PMRN_PMC4);
+                case 5:
+                        return mfpmr(PMRN_PMC5);
                 default:
                         return 0;
         }
@@ -104,6 +120,12 @@ static inline void ctr_write(unsigned int i, unsigned int val)
                 case 3:
                         mtpmr(PMRN_PMC3, val);
                         break;
+                case 4:
+                        mtpmr(PMRN_PMC4, val);
+                        break;
+                case 5:
+                        mtpmr(PMRN_PMC5, val);
+                        break;
                 default:
                         break;
         }
@@ -133,6 +155,14 @@ static void init_pmc_stop(int ctr)
                         mtpmr(PMRN_PMLCA3, pmlca);
                         mtpmr(PMRN_PMLCB3, pmlcb);
                         break;
+                case 4:
+                        mtpmr(PMRN_PMLCA4, pmlca);
+                        mtpmr(PMRN_PMLCB4, pmlcb);
+                        break;
+                case 5:
+                        mtpmr(PMRN_PMLCA5, pmlca);
+                        mtpmr(PMRN_PMLCB5, pmlcb);
+                        break;
                 default:
                         panic("Bad ctr number!\n");
         }