diff options
| author | Dmitri Vorobiev <dmitri.vorobiev@gmail.com> | 2008-04-02 03:58:38 +0400 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2008-04-28 17:14:31 +0100 |
| commit | 46684734dd6a55af09c3fe799af7d74cb938684c (patch) | |
| tree | 117776ad58f5007000139b7f7d8031cc400d7a6d /arch/mips/oprofile | |
| parent | c5b0680aa1d7a751b7dd8ebf6854e5baf0a2e54b (diff) | |
| download | linux-stable-46684734dd6a55af09c3fe799af7d74cb938684c.tar.gz linux-stable-46684734dd6a55af09c3fe799af7d74cb938684c.tar.bz2 linux-stable-46684734dd6a55af09c3fe799af7d74cb938684c.zip | |
[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: Dmitri Vorobiev <dmitri.vorobiev@gmail.com>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
Diffstat (limited to 'arch/mips/oprofile')
| -rw-r--r-- | arch/mips/oprofile/op_impl.h | 1 | ||||
| -rw-r--r-- | arch/mips/oprofile/op_model_mipsxx.c | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/arch/mips/oprofile/op_impl.h b/arch/mips/oprofile/op_impl.h index fa6b4aae7523..2bfc17c30106 100644 --- a/arch/mips/oprofile/op_impl.h +++ b/arch/mips/oprofile/op_impl.h @@ -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. */ diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c index ca65469d7e30..da8cbb6899dc 100644 --- a/arch/mips/oprofile/op_model_mipsxx.c +++ b/arch/mips/oprofile/op_model_mipsxx.c @@ -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 = { |