aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux/generic
diff options
context:
space:
mode:
Diffstat (limited to 'target/linux/generic')
-rw-r--r--target/linux/generic/patches-4.4/005-Revert-genirq-Use-irqd_get_trigger_type-to-compare-t.patch37
-rw-r--r--target/linux/generic/patches-4.4/834-ledtrig-libata.patch8
2 files changed, 4 insertions, 41 deletions
diff --git a/target/linux/generic/patches-4.4/005-Revert-genirq-Use-irqd_get_trigger_type-to-compare-t.patch b/target/linux/generic/patches-4.4/005-Revert-genirq-Use-irqd_get_trigger_type-to-compare-t.patch
deleted file mode 100644
index 5b44e996b6..0000000000
--- a/target/linux/generic/patches-4.4/005-Revert-genirq-Use-irqd_get_trigger_type-to-compare-t.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 6f879697d6393aa6918537c4c46e44c8579dd2a1 Mon Sep 17 00:00:00 2001
-From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-Date: Fri, 30 Mar 2018 10:53:44 +0200
-Subject: [PATCH] Revert "genirq: Use irqd_get_trigger_type to compare the
- trigger type for shared IRQs"
-
-This reverts commit 9d0273bb1c4b645817eccfe5c5975ea29add3300 which is
-commit 382bd4de61827dbaaf5fb4fb7b1f4be4a86505e7 upstream.
-
-It causes too many problems with the stable tree, and would require too
-many other things to be backported, so just revert it.
-
-Reported-by: Guenter Roeck <linux@roeck-us.net>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Hans de Goede <hdegoede@redhat.com>
-Cc: Marc Zyngier <marc.zyngier@arm.com>
-Cc: Thomas Gleixner <tglx@linutronix.de>
-Cc: Sasha Levin <alexander.levin@microsoft.com>
-Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
----
- kernel/irq/manage.c | 4 +---
- 1 file changed, 1 insertion(+), 3 deletions(-)
-
---- a/kernel/irq/manage.c
-+++ b/kernel/irq/manage.c
-@@ -1189,10 +1189,8 @@ __setup_irq(unsigned int irq, struct irq
- * set the trigger type must match. Also all must
- * agree on ONESHOT.
- */
-- unsigned int oldtype = irqd_get_trigger_type(&desc->irq_data);
--
- if (!((old->flags & new->flags) & IRQF_SHARED) ||
-- (oldtype != (new->flags & IRQF_TRIGGER_MASK)) ||
-+ ((old->flags ^ new->flags) & IRQF_TRIGGER_MASK) ||
- ((old->flags ^ new->flags) & IRQF_ONESHOT))
- goto mismatch;
-
diff --git a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
index ad63634479..ca19ad6379 100644
--- a/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
+++ b/target/linux/generic/patches-4.4/834-ledtrig-libata.patch
@@ -69,7 +69,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
/**
* ata_build_rw_tf - Build ATA taskfile for given read/write request
* @tf: Target ATA taskfile
-@@ -4781,6 +4794,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
+@@ -4802,6 +4815,9 @@ struct ata_queued_cmd *ata_qc_new_init(s
if (tag < 0)
return NULL;
}
@@ -79,7 +79,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
qc = __ata_qc_from_tag(ap, tag);
qc->tag = tag;
-@@ -5678,6 +5694,9 @@ struct ata_port *ata_port_alloc(struct a
+@@ -5698,6 +5714,9 @@ struct ata_port *ata_port_alloc(struct a
ap->stats.unhandled_irq = 1;
ap->stats.idle_irq = 1;
#endif
@@ -89,7 +89,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
ata_sff_port_init(ap);
return ap;
-@@ -5699,6 +5718,12 @@ static void ata_host_release(struct devi
+@@ -5719,6 +5738,12 @@ static void ata_host_release(struct devi
kfree(ap->pmp_link);
kfree(ap->slave_link);
@@ -102,7 +102,7 @@ Signed-off-by: Daniel Golle <daniel@makrotopia.org>
kfree(ap);
host->ports[i] = NULL;
}
-@@ -6145,7 +6170,23 @@ int ata_host_register(struct ata_host *h
+@@ -6165,7 +6190,23 @@ int ata_host_register(struct ata_host *h
host->ports[i]->print_id = atomic_inc_return(&ata_print_id);
host->ports[i]->local_port_no = i + 1;
}