summaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.1/307-mips_oprofile_fix.patch
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2011-08-09 12:19:43 +0000
committerJonas Gorski <jogo@openwrt.org>2011-08-09 12:19:43 +0000
commitcf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4 (patch)
treef0d9e62c746434dde7a45ed0debd3eb94b92dc65 /target/linux/generic/patches-3.1/307-mips_oprofile_fix.patch
parenta5f2fd63598414246a497e08a4433a0116f2f606 (diff)
downloadmaster-31e0f0ae-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.gz
master-31e0f0ae-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.tar.bz2
master-31e0f0ae-cf2070bd5b394d5c3fcfae577bd623a6e8a7f0c4.zip
linux: generic: add support for 3.1-rc1
SVN-Revision: 27940
Diffstat (limited to 'target/linux/generic/patches-3.1/307-mips_oprofile_fix.patch')
-rw-r--r--target/linux/generic/patches-3.1/307-mips_oprofile_fix.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.1/307-mips_oprofile_fix.patch b/target/linux/generic/patches-3.1/307-mips_oprofile_fix.patch
new file mode 100644
index 0000000000..f83c96bb81
--- /dev/null
+++ b/target/linux/generic/patches-3.1/307-mips_oprofile_fix.patch
@@ -0,0 +1,35 @@
+--- a/arch/mips/oprofile/op_model_mipsxx.c
++++ b/arch/mips/oprofile/op_model_mipsxx.c
+@@ -298,6 +298,11 @@ static void reset_counters(void *arg)
+ }
+ }
+
++static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
++{
++ return mipsxx_perfcount_handler();
++}
++
+ static int __init mipsxx_init(void)
+ {
+ int counters;
+@@ -374,6 +379,10 @@ static int __init mipsxx_init(void)
+ save_perf_irq = perf_irq;
+ perf_irq = mipsxx_perfcount_handler;
+
++ if (cp0_perfcount_irq >= 0)
++ return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
++ IRQF_SHARED, "Perfcounter", save_perf_irq);
++
+ return 0;
+ }
+
+@@ -381,6 +390,9 @@ static void mipsxx_exit(void)
+ {
+ int counters = op_model_mipsxx_ops.num_counters;
+
++ if (cp0_perfcount_irq >= 0)
++ free_irq(cp0_perfcount_irq, save_perf_irq);
++
+ counters = counters_per_cpu_to_total(counters);
+ on_each_cpu(reset_counters, (void *)(long)counters, 1);
+