[MIPS] unexport null_perf_irq() and make it static
authorDmitri Vorobiev <dmitri.vorobiev@gmail.com>
Tue, 1 Apr 2008 23:58:38 +0000 (03:58 +0400)
committerRalf Baechle <ralf@linux-mips.org>
Mon, 28 Apr 2008 16:14:31 +0000 (17:14 +0100)
This patch unexports the null_perf_irq() symbol, and simultaneously
makes this function static.

Signed-off-by: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/kernel/time.c
arch/mips/oprofile/op_impl.h
arch/mips/oprofile/op_model_mipsxx.c

index d70ce5ca4802de1498fbeeaf322c54869a9391b3..1f467d5346426d5af02bfffa7bbec5b3c6f689ba 100644 (file)
@@ -49,13 +49,11 @@ int update_persistent_clock(struct timespec now)
        return rtc_mips_set_mmss(now.tv_sec);
 }
 
-int null_perf_irq(void)
+static int null_perf_irq(void)
 {
        return 0;
 }
 
-EXPORT_SYMBOL(null_perf_irq);
-
 int (*perf_irq)(void) = null_perf_irq;
 
 EXPORT_SYMBOL(perf_irq);
index fa6b4aae75233f764d1979f7b1f0e5fd9944545e..2bfc17c3010613d7a8a4ea87e92fac9112810675 100644 (file)
@@ -10,7 +10,6 @@
 #ifndef OP_IMPL_H
 #define OP_IMPL_H 1
 
-extern int null_perf_irq(void);
 extern int (*perf_irq)(void);
 
 /* Per-counter configuration as set via oprofilefs.  */
index ca65469d7e30b141c3a072e41a8226bc505bb3da..da8cbb6899dcde8cb439fd53766f0281dad78c1d 100644 (file)
@@ -31,6 +31,8 @@
 
 #define M_COUNTER_OVERFLOW             (1UL      << 31)
 
+static int (*save_perf_irq)(void);
+
 #ifdef CONFIG_MIPS_MT_SMP
 static int cpu_has_mipsmt_pertccounters;
 #define WHAT           (M_TC_EN_VPE | \
@@ -369,6 +371,7 @@ static int __init mipsxx_init(void)
                return -ENODEV;
        }
 
+       save_perf_irq = perf_irq;
        perf_irq = mipsxx_perfcount_handler;
 
        return 0;
@@ -381,7 +384,7 @@ static void mipsxx_exit(void)
        counters = counters_per_cpu_to_total(counters);
        on_each_cpu(reset_counters, (void *)counters, 0, 1);
 
-       perf_irq = null_perf_irq;
+       perf_irq = save_perf_irq;
 }
 
 struct op_mips_model op_model_mipsxx_ops = {