diff options
author | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-15 21:31:01 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2011-06-15 21:31:01 +0000 |
commit | 235e3319876d5d1354e2774ec73495fdeb2616ec (patch) | |
tree | d776ac5daed14d9e6ee5562e979d388420e8ff08 /target/linux/generic/patches-3.0/307-mips_oprofile_fix.patch | |
parent | 0db9c2bd7d3620ba18fa784bda702d971783b4f6 (diff) | |
download | mtk-20170518-235e3319876d5d1354e2774ec73495fdeb2616ec.zip mtk-20170518-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.gz mtk-20170518-235e3319876d5d1354e2774ec73495fdeb2616ec.tar.bz2 |
linux/generic: Add support for 3.0-rc3
Also make linux identify itself properly as 3.0, not 3.0.0.
Signed-off-by: Jonas Gorski <jonas.gorski+openwrt@gmail.com>
SVN-Revision: 27191
Diffstat (limited to 'target/linux/generic/patches-3.0/307-mips_oprofile_fix.patch')
-rw-r--r-- | target/linux/generic/patches-3.0/307-mips_oprofile_fix.patch | 35 |
1 files changed, 35 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.0/307-mips_oprofile_fix.patch b/target/linux/generic/patches-3.0/307-mips_oprofile_fix.patch new file mode 100644 index 0000000..f83c96b --- /dev/null +++ b/target/linux/generic/patches-3.0/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); + |