1 files changed, 3 insertions, 2 deletions

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