Commit 46684734 authored by Dmitri Vorobiev's avatar Dmitri Vorobiev Committed by Ralf Baechle

[MIPS] unexport null_perf_irq() and make it static

This patch unexports the null_perf_irq() symbol, and simultaneously
makes this function static.
Signed-off-by: default avatarDmitri Vorobiev <dmitri.vorobiev@gmail.com>
Signed-off-by: default avatarRalf Baechle <ralf@linux-mips.org>
parent c5b0680a
...@@ -49,13 +49,11 @@ int update_persistent_clock(struct timespec now) ...@@ -49,13 +49,11 @@ int update_persistent_clock(struct timespec now)
return rtc_mips_set_mmss(now.tv_sec); return rtc_mips_set_mmss(now.tv_sec);
} }
int null_perf_irq(void) static int null_perf_irq(void)
{ {
return 0; return 0;
} }
EXPORT_SYMBOL(null_perf_irq);
int (*perf_irq)(void) = null_perf_irq; int (*perf_irq)(void) = null_perf_irq;
EXPORT_SYMBOL(perf_irq); EXPORT_SYMBOL(perf_irq);
......
...@@ -10,7 +10,6 @@ ...@@ -10,7 +10,6 @@
#ifndef OP_IMPL_H #ifndef OP_IMPL_H
#define OP_IMPL_H 1 #define OP_IMPL_H 1
extern int null_perf_irq(void);
extern int (*perf_irq)(void); extern int (*perf_irq)(void);
/* Per-counter configuration as set via oprofilefs. */ /* Per-counter configuration as set via oprofilefs. */
......
...@@ -31,6 +31,8 @@ ...@@ -31,6 +31,8 @@
#define M_COUNTER_OVERFLOW (1UL << 31) #define M_COUNTER_OVERFLOW (1UL << 31)
static int (*save_perf_irq)(void);
#ifdef CONFIG_MIPS_MT_SMP #ifdef CONFIG_MIPS_MT_SMP
static int cpu_has_mipsmt_pertccounters; static int cpu_has_mipsmt_pertccounters;
#define WHAT (M_TC_EN_VPE | \ #define WHAT (M_TC_EN_VPE | \
...@@ -369,6 +371,7 @@ static int __init mipsxx_init(void) ...@@ -369,6 +371,7 @@ static int __init mipsxx_init(void)
return -ENODEV; return -ENODEV;
} }
save_perf_irq = perf_irq;
perf_irq = mipsxx_perfcount_handler; perf_irq = mipsxx_perfcount_handler;
return 0; return 0;
...@@ -381,7 +384,7 @@ static void mipsxx_exit(void) ...@@ -381,7 +384,7 @@ static void mipsxx_exit(void)
counters = counters_per_cpu_to_total(counters); counters = counters_per_cpu_to_total(counters);
on_each_cpu(reset_counters, (void *)counters, 0, 1); 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 = { struct op_mips_model op_model_mipsxx_ops = {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment