linux 2.6.16.38 w/ vs2.0.3-rc1

[linux-2.6.git] / arch / mips / oprofile / common.c

diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index 65eb554..935dd85 100644 (file)
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -14,8 +14,8 @@
 
 #include "op_impl.h"
 
-extern struct op_mips_model op_model_mipsxx_ops __attribute__((weak));
-extern struct op_mips_model op_model_rm9000_ops __attribute__((weak));
+extern struct op_mips_model op_model_mipsxx __attribute__((weak));
+extern struct op_mips_model op_model_rm9000 __attribute__((weak));
 
 static struct op_mips_model *model;
 
@@ -27,7 +27,7 @@ static int op_mips_setup(void)
        model->reg_setup(ctr);
 
        /* Configure the registers on all cpus.  */
-       on_each_cpu(model->cpu_setup, NULL, 0, 1);
+       on_each_cpu(model->cpu_setup, 0, 0, 1);
 
         return 0;
 }
@@ -38,7 +38,7 @@ static int op_mips_create_files(struct super_block * sb, struct dentry * root)
 
        for (i = 0; i < model->num_counters; ++i) {
                struct dentry *dir;
-               char buf[4];
+               char buf[3];
 
                snprintf(buf, sizeof buf, "%d", i);
                dir = oprofilefs_mkdir(sb, root, buf);
@@ -80,14 +80,13 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
        case CPU_24K:
        case CPU_25KF:
        case CPU_34K:
-       case CPU_74K:
        case CPU_SB1:
        case CPU_SB1A:
-               lmodel = &op_model_mipsxx_ops;
+               lmodel = &op_model_mipsxx;
                break;
 
        case CPU_RM9000:
-               lmodel = &op_model_rm9000_ops;
+               lmodel = &op_model_rm9000;
                break;
        };
 
@@ -115,6 +114,5 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 
 void oprofile_arch_exit(void)
 {
-       if (model)
-               model->exit();
+       model->exit();
 }