From a3843e7ec7270c9456c81c958658a407d5d1409b Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Wed, 5 Dec 2012 16:49:48 +0000 Subject: [PATCH] kernel 3.6+: nuke obsolete patches that are messing up oprofile builds SVN-Revision: 34506 --- .../patches-3.6/307-mips_oprofile_fix.patch | 35 ------------------- .../patches-3.7/307-mips_oprofile_fix.patch | 35 ------------------- 2 files changed, 70 deletions(-) delete mode 100644 target/linux/generic/patches-3.6/307-mips_oprofile_fix.patch delete mode 100644 target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch 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 bed5786454f4..000000000000 --- 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 bed5786454f4..000000000000 --- 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); - -- 2.30.2