bump kernel to 3.2.12
[openwrt/openwrt.git] / target / linux / lantiq / patches-3.2 / 0017-MIPS-make-oprofile-use-cp0_perfcount_irq-if-it-is-se.patch
1 From bc3a07e6c5149a82a22239a43e9f98514c2010d9 Mon Sep 17 00:00:00 2001
2 From: John Crispin <blogic@openwrt.org>
3 Date: Wed, 24 Aug 2011 13:24:11 +0200
4 Subject: [PATCH 17/70] MIPS: make oprofile use cp0_perfcount_irq if it is set
5
6 The patch makes the oprofile code use the performance counters irq.
7
8 This patch is written by Felix Fietkau.
9
10 Signed-off-by: Felix Fietkau <nbd@openwrt.org>
11 Signed-off-by: John Crispin <blogic@openwrt.org>
12 ---
13 arch/mips/oprofile/op_model_mipsxx.c | 12 ++++++++++++
14 1 files changed, 12 insertions(+), 0 deletions(-)
15
16 diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c
17 index 54759f1..86cf234 100644
18 --- a/arch/mips/oprofile/op_model_mipsxx.c
19 +++ b/arch/mips/oprofile/op_model_mipsxx.c
20 @@ -298,6 +298,11 @@ static void reset_counters(void *arg)
21 }
22 }
23
24 +static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
25 +{
26 + return mipsxx_perfcount_handler();
27 +}
28 +
29 static int __init mipsxx_init(void)
30 {
31 int counters;
32 @@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
33 save_perf_irq = perf_irq;
34 perf_irq = mipsxx_perfcount_handler;
35
36 + if (cp0_perfcount_irq >= 0)
37 + return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
38 + IRQF_SHARED, "Perfcounter", save_perf_irq);
39 +
40 return 0;
41 }
42
43 @@ -381,6 +390,9 @@ static void mipsxx_exit(void)
44 {
45 int counters = op_model_mipsxx_ops.num_counters;
46
47 + if (cp0_perfcount_irq >= 0)
48 + free_irq(cp0_perfcount_irq, save_perf_irq);
49 +
50 counters = counters_per_cpu_to_total(counters);
51 on_each_cpu(reset_counters, (void *)(long)counters, 1);
52
53 --
54 1.7.7.1
55