X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=arch%2Fmips%2Foprofile%2Fcommon.c;h=935dd851f480c0065c37d4275c71f40b663aab5b;hb=987b0145d94eecf292d8b301228356f44611ab7c;hp=c31e4cff64e043437a9019bfeae3890c2ee043eb;hpb=f7ed79d23a47594e7834d66a8f14449796d4f3e6;p=linux-2.6.git

diff --git a/arch/mips/oprofile/common.c b/arch/mips/oprofile/common.c
index c31e4cff6..935dd851f 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_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;
 }
@@ -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();
 }