diff options
| author | Felix Fietkau <nbd@openwrt.org> | 2012-12-05 16:49:48 +0000 |
|---|---|---|
| committer | Felix Fietkau <nbd@openwrt.org> | 2012-12-05 16:49:48 +0000 |
| commit | b0d6a6b1eb427b01f67b211e68d876617500bdd4 (patch) | |
| tree | 8de188bc5a043a21ef78b5f163f96743624f24d1 | |
| parent | eebdec56b1799eefdbc699b8733cb4c1f8025393 (diff) | |
| download | upstream-b0d6a6b1eb427b01f67b211e68d876617500bdd4.tar.gz upstream-b0d6a6b1eb427b01f67b211e68d876617500bdd4.tar.bz2 upstream-b0d6a6b1eb427b01f67b211e68d876617500bdd4.zip | |
kernel 3.6+: nuke obsolete patches that are messing up oprofile builds
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@34506 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/generic/patches-3.6/307-mips_oprofile_fix.patch | 35 | ||||
| -rw-r--r-- | target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch | 35 |
2 files changed, 0 insertions, 70 deletions
diff --git a/target/linux/generic/patches-3.6/307-mips_oprofile_fix.patch b/target/linux/generic/patches-3.6/307-mips_oprofile_fix.patch deleted file mode 100644 index bed5786454..0000000000 --- a/target/linux/generic/patches-3.6/307-mips_oprofile_fix.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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); - 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 deleted file mode 100644 index bed5786454..0000000000 --- a/target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch +++ /dev/null @@ -1,35 +0,0 @@ ---- 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); - |