From 935ca3f3eb7435b50b91bc2ed341a4bbd6e759b0 Mon Sep 17 00:00:00 2001
From: Imre Kaloz <kaloz@openwrt.org>
Date: Sun, 18 Nov 2012 18:52:38 +0000
Subject: add 3.7-rc6 support (patch 820 still has to be fixed)

SVN-Revision: 34247
---
 .../patches-3.7/307-mips_oprofile_fix.patch        | 35 ++++++++++++++++++++++
 1 file changed, 35 insertions(+)
 create mode 100644 target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch

(limited to 'target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch')

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 0000000..bed5786
--- /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);
+ 
-- 
cgit v1.1