diff options
author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-01 07:56:55 +0000 |
---|---|---|
committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-04-01 07:56:55 +0000 |
commit | f21c103e5a69f7e6c18fc33fc6da1940f2307c60 (patch) | |
tree | af668f3ffd4777fd9823251436d2a82e2240e1a0 /target/linux/lantiq/patches-3.2/0017-MIPS-make-oprofile-use-cp0_perfcount_irq-if-it-is-se.patch | |
parent | 1efef1fe09658b5ec0aff95075b72f542416bf7e (diff) |
kernel: update linux 3.2 to 3.2.13 and refresh patches
Also remove a duplicate patch from lantiq (already in generic).
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31158 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/lantiq/patches-3.2/0017-MIPS-make-oprofile-use-cp0_perfcount_irq-if-it-is-se.patch')
-rw-r--r-- | target/linux/lantiq/patches-3.2/0017-MIPS-make-oprofile-use-cp0_perfcount_irq-if-it-is-se.patch | 55 |
1 files changed, 0 insertions, 55 deletions
diff --git a/target/linux/lantiq/patches-3.2/0017-MIPS-make-oprofile-use-cp0_perfcount_irq-if-it-is-se.patch b/target/linux/lantiq/patches-3.2/0017-MIPS-make-oprofile-use-cp0_perfcount_irq-if-it-is-se.patch deleted file mode 100644 index a879cd8ba..000000000 --- a/target/linux/lantiq/patches-3.2/0017-MIPS-make-oprofile-use-cp0_perfcount_irq-if-it-is-se.patch +++ /dev/null @@ -1,55 +0,0 @@ -From bc3a07e6c5149a82a22239a43e9f98514c2010d9 Mon Sep 17 00:00:00 2001 -From: John Crispin <blogic@openwrt.org> -Date: Wed, 24 Aug 2011 13:24:11 +0200 -Subject: [PATCH 17/70] MIPS: make oprofile use cp0_perfcount_irq if it is set - -The patch makes the oprofile code use the performance counters irq. - -This patch is written by Felix Fietkau. - -Signed-off-by: Felix Fietkau <nbd@openwrt.org> -Signed-off-by: John Crispin <blogic@openwrt.org> ---- - arch/mips/oprofile/op_model_mipsxx.c | 12 ++++++++++++ - 1 files changed, 12 insertions(+), 0 deletions(-) - -diff --git a/arch/mips/oprofile/op_model_mipsxx.c b/arch/mips/oprofile/op_model_mipsxx.c -index 54759f1..86cf234 100644 ---- 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); - --- -1.7.7.1 - |