aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2015-01-15 12:19:12 +0000
committerFelix Fietkau <nbd@openwrt.org>2015-01-15 12:19:12 +0000
commit4f2fe5d7fabedafe8030e39604751f56171d85f4 (patch)
tree929e6758407c6019a51d2a63b4e001931e50b969
parent4ae1e883e878ccb38750d189641954800d299c81 (diff)
downloadupstream-4f2fe5d7fabedafe8030e39604751f56171d85f4.tar.gz
upstream-4f2fe5d7fabedafe8030e39604751f56171d85f4.tar.bz2
upstream-4f2fe5d7fabedafe8030e39604751f56171d85f4.zip
kernel: fix disable_irq() on MIPS CPU IRQs
Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43973
-rw-r--r--target/linux/generic/patches-3.14/130-mips_cpu_irq_disable.patch20
-rw-r--r--target/linux/generic/patches-3.18/130-mips_cpu_irq_disable.patch20
2 files changed, 40 insertions, 0 deletions
diff --git a/target/linux/generic/patches-3.14/130-mips_cpu_irq_disable.patch b/target/linux/generic/patches-3.14/130-mips_cpu_irq_disable.patch
new file mode 100644
index 0000000000..7ebbc99dba
--- /dev/null
+++ b/target/linux/generic/patches-3.14/130-mips_cpu_irq_disable.patch
@@ -0,0 +1,20 @@
+--- a/arch/mips/kernel/irq_cpu.c
++++ b/arch/mips/kernel/irq_cpu.c
+@@ -56,6 +56,8 @@ static struct irq_chip mips_cpu_irq_cont
+ .irq_mask_ack = mask_mips_irq,
+ .irq_unmask = unmask_mips_irq,
+ .irq_eoi = unmask_mips_irq,
++ .irq_disable = mask_mips_irq,
++ .irq_enable = unmask_mips_irq,
+ };
+
+ /*
+@@ -92,6 +94,8 @@ static struct irq_chip mips_mt_cpu_irq_c
+ .irq_mask_ack = mips_mt_cpu_irq_ack,
+ .irq_unmask = unmask_mips_irq,
+ .irq_eoi = unmask_mips_irq,
++ .irq_disable = mask_mips_irq,
++ .irq_enable = unmask_mips_irq,
+ };
+
+ void __init mips_cpu_irq_init(void)
diff --git a/target/linux/generic/patches-3.18/130-mips_cpu_irq_disable.patch b/target/linux/generic/patches-3.18/130-mips_cpu_irq_disable.patch
new file mode 100644
index 0000000000..7ebbc99dba
--- /dev/null
+++ b/target/linux/generic/patches-3.18/130-mips_cpu_irq_disable.patch
@@ -0,0 +1,20 @@
+--- a/arch/mips/kernel/irq_cpu.c
++++ b/arch/mips/kernel/irq_cpu.c
+@@ -56,6 +56,8 @@ static struct irq_chip mips_cpu_irq_cont
+ .irq_mask_ack = mask_mips_irq,
+ .irq_unmask = unmask_mips_irq,
+ .irq_eoi = unmask_mips_irq,
++ .irq_disable = mask_mips_irq,
++ .irq_enable = unmask_mips_irq,
+ };
+
+ /*
+@@ -92,6 +94,8 @@ static struct irq_chip mips_mt_cpu_irq_c
+ .irq_mask_ack = mips_mt_cpu_irq_ack,
+ .irq_unmask = unmask_mips_irq,
+ .irq_eoi = unmask_mips_irq,
++ .irq_disable = mask_mips_irq,
++ .irq_enable = unmask_mips_irq,
+ };
+
+ void __init mips_cpu_irq_init(void)