MIPS: Oprofile: Fixup the loose ends in the plumbing.

    
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

2 files changed, 7 insertions, 3 deletions

diff --git a/arch/mips/oprofile/op_impl.h b/arch/mips/oprofile/op_impl.h
index f0121557047d..5cfce7d87a4d 100644
--- a/arch/mips/oprofile/op_impl.h
+++ b/arch/mips/oprofile/op_impl.h
@@ -12,8 +12,8 @@
 
 struct pt_regs;
 
-extern void null_perf_irq(struct pt_regs *regs);
-extern void (*perf_irq)(struct pt_regs *regs);
+extern int null_perf_irq(struct pt_regs *regs);
+extern int (*perf_irq)(struct pt_regs *regs);
 
 /* Per-counter configuration as set via oprofilefs.  */
 struct op_counter_config {
diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
index d36b64dfcb2f..a4a4aa99ab03 100644
--- a/arch/mips/oprofile/op_model_mipsxx.c
+++ b/arch/mips/oprofile/op_model_mipsxx.c
@@ -114,11 +114,12 @@ static void mipsxx_cpu_stop(void *args)
         }
 }
 
-static void mipsxx_perfcount_handler(struct pt_regs *regs)
+static int mipsxx_perfcount_handler(struct pt_regs *regs)
 {
         unsigned int counters = op_model_mipsxx.num_counters;
         unsigned int control;
         unsigned int counter;
+        int handled = 0;
 
         switch (counters) {
 #define HANDLE_COUNTER(n)                                               \
@@ -129,12 +130,15 @@ static void mipsxx_perfcount_handler(struct pt_regs *regs)
                     (counter & M_COUNTER_OVERFLOW)) {                   \
                         oprofile_add_sample(regs, n);                   \
                         write_c0_perfcntr ## n(reg.counter[n]);         \
+                        handled = 1;                                    \
                 }
         HANDLE_COUNTER(3)
         HANDLE_COUNTER(2)
         HANDLE_COUNTER(1)
         HANDLE_COUNTER(0)
         }
+
+        return handled;
 }
 
 #define M_CONFIG1_PC    (1 << 4)