1 files changed, 8 insertions, 6 deletions

diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index 935dd851f480..c31e4cff64e0 100644
--- 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 __attribute__((weak));
-extern struct op_mips_model op_model_rm9000 __attribute__((weak));
+extern struct op_mips_model op_model_mipsxx_ops __attribute__((weak));
+extern struct op_mips_model op_model_rm9000_ops __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, 0, 0, 1);
+        on_each_cpu(model->cpu_setup, NULL, 0, 1);
 
         return 0;
 }
@@ -80,13 +80,14 @@ 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;
+                lmodel = &op_model_mipsxx_ops;
                 break;
 
         case CPU_RM9000:
-                lmodel = &op_model_rm9000;
+                lmodel = &op_model_rm9000_ops;
                 break;
         };
 
@@ -114,5 +115,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 
 void oprofile_arch_exit(void)
 {
-        model->exit();
+        if (model)
+                model->exit();
 }