aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch
diff options
context:
space:
mode:
authorImre Kaloz <kaloz@openwrt.org>2012-11-18 18:52:38 +0000
committerImre Kaloz <kaloz@openwrt.org>2012-11-18 18:52:38 +0000
commit43d2eb64ccb3a223ba2244faee1280aaa6f68d11 (patch)
tree86525769ccc1e76c33de9d10b51d14bdc0e1c8f7 /target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch
parent2b0cba675561342a1a538bad8a7df10cf855323e (diff)
downloadupstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.gz
upstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.tar.bz2
upstream-43d2eb64ccb3a223ba2244faee1280aaa6f68d11.zip
[generic]: add 3.7-rc6 support (patch 820 still has to be fixed)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34247 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch')
-rw-r--r--target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch35
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch b/target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch
new file mode 100644
index 0000000000..bed5786454
--- /dev/null
+++ b/target/linux/generic/patches-3.7/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
+@@ -303,6 +303,11 @@ static irqreturn_t mipsxx_perfcount_int(
+ return mipsxx_perfcount_handler();
+ }
+
++static irqreturn_t mipsxx_perfcount_int(int irq, void *dev_id)
++{
++ return mipsxx_perfcount_handler();
++}
++
+ static int __init mipsxx_init(void)
+ {
+ int counters;
+@@ -385,6 +390,10 @@ static int __init mipsxx_init(void)
+ return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
+ 0, "Perfcounter", save_perf_irq);
+
++ if (cp0_perfcount_irq >= 0)
++ return request_irq(cp0_perfcount_irq, mipsxx_perfcount_int,
++ IRQF_SHARED, "Perfcounter", save_perf_irq);
++
+ return 0;
+ }
+
+@@ -395,6 +404,9 @@ static void mipsxx_exit(void)
+ if ((cp0_perfcount_irq >= 0) && (cp0_compare_irq != cp0_perfcount_irq))
+ free_irq(cp0_perfcount_irq, save_perf_irq);
+
++ 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);
+