kernel: bump 5.10 to 5.10.115

[openwrt/staging/chunkeey.git] / target / linux / generic / pending-5.15 / 850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch

diff --git a/target/linux/generic/pending-5.15/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch b/target/linux/generic/pending-5.15/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch
index 154b11290ac9d12ba46a35edf27805342006d873..070809fa730cfaac122443169a868c49057733b1 100644 (file)
--- a/target/linux/generic/pending-5.15/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch
+++ b/target/linux/generic/pending-5.15/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch
@@ -25,7 +25,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
 
 --- a/drivers/pci/controller/pci-aardvark.c
 +++ b/drivers/pci/controller/pci-aardvark.c
-@@ -281,8 +281,6 @@ struct advk_pcie {
+@@ -274,8 +274,6 @@ struct advk_pcie {
        raw_spinlock_t irq_lock;
        struct irq_domain *msi_domain;
        struct irq_domain *msi_inner_domain;
@@ -34,7 +34,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
        struct msi_domain_info msi_domain_info;
        DECLARE_BITMAP(msi_used, MSI_IRQ_NUM);
        struct mutex msi_used_lock;
-@@ -1199,6 +1197,12 @@ static int advk_msi_set_affinity(struct
+@@ -1194,6 +1192,12 @@ static int advk_msi_set_affinity(struct
        return -EINVAL;
  }
  
@@ -47,7 +47,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
  static int advk_msi_irq_domain_alloc(struct irq_domain *domain,
                                     unsigned int virq,
                                     unsigned int nr_irqs, void *args)
-@@ -1215,7 +1219,7 @@ static int advk_msi_irq_domain_alloc(str
+@@ -1210,7 +1214,7 @@ static int advk_msi_irq_domain_alloc(str
  
        for (i = 0; i < nr_irqs; i++)
                irq_domain_set_info(domain, virq + i, hwirq + i,
@@ -56,7 +56,7 @@ Signed-off-by: Marek Behún <kabel@kernel.org>
                                    domain->host_data, handle_simple_irq,
                                    NULL, NULL);
  
-@@ -1285,29 +1289,23 @@ static const struct irq_domain_ops advk_
+@@ -1280,29 +1284,23 @@ static const struct irq_domain_ops advk_
        .xlate = irq_domain_xlate_onecell,
  };