[MIPS] Fix detection and handling of the 74K processor.

[deliverable/linux.git] / arch / mips / oprofile / common.c

diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index 935dd851f480c0065c37d4275c71f40b663aab5b..91b799d2cd88f2ad6fa21fccf5d76e49c71a61fa 100644 (file)
--- a/arch/mips/oprofile/common.c
+++ b/arch/mips/oprofile/common.c
@@ -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,6 +80,7 @@ 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;
@@ -114,5 +115,6 @@ int __init oprofile_arch_init(struct oprofile_operations *ops)
 
 void oprofile_arch_exit(void)
 {
-       model->exit();
+       if (model)
+               model->exit();
 }