kernel 3.6+: nuke obsolete patches that are messing up oprofile builds
authorFelix Fietkau <nbd@openwrt.org>
Wed, 5 Dec 2012 16:49:48 +0000 (16:49 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Wed, 5 Dec 2012 16:49:48 +0000 (16:49 +0000)
SVN-Revision: 34506

target/linux/generic/patches-3.6/307-mips_oprofile_fix.patch [deleted file]
target/linux/generic/patches-3.7/307-mips_oprofile_fix.patch [deleted file]

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 (file)
index bed5786..0000000
+++ /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 (file)
index bed5786..0000000
+++ /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);