diff options
author | Rui Salvaterra <rsalvaterra@gmail.com> | 2022-01-16 12:53:21 +0000 |
---|---|---|
committer | Hauke Mehrtens <hauke@hauke-m.de> | 2022-01-16 20:51:14 +0100 |
commit | 61e58f7cecb9f6044375dd7839f56a6e07807903 (patch) | |
tree | 98dd9710ba87d1aa00f4d398c6af080cace49b34 /target/linux/generic/pending-5.10/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch | |
parent | 7229981994d3459e9bd5911b3e36fd09ab4ec428 (diff) | |
download | upstream-61e58f7cecb9f6044375dd7839f56a6e07807903.tar.gz upstream-61e58f7cecb9f6044375dd7839f56a6e07807903.tar.bz2 upstream-61e58f7cecb9f6044375dd7839f56a6e07807903.zip |
kernel: bump 5.10 to 5.10.92
Patches automatically rebased.
Signed-off-by: Rui Salvaterra <rsalvaterra@gmail.com>
Diffstat (limited to 'target/linux/generic/pending-5.10/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch')
-rw-r--r-- | target/linux/generic/pending-5.10/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/target/linux/generic/pending-5.10/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch b/target/linux/generic/pending-5.10/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch index b7d4108893..13734cd8fa 100644 --- a/target/linux/generic/pending-5.10/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch +++ b/target/linux/generic/pending-5.10/850-0006-PCI-aardvark-Make-MSI-irq_chip-structures-static-dri.patch @@ -23,8 +23,6 @@ Signed-off-by: Marek BehĂșn <kabel@kernel.org> drivers/pci/controller/pci-aardvark.c | 26 ++++++++++++-------------- 1 file changed, 12 insertions(+), 14 deletions(-) -diff --git a/drivers/pci/controller/pci-aardvark.c b/drivers/pci/controller/pci-aardvark.c -index 4be05b52d835..c7bd6b123857 100644 --- a/drivers/pci/controller/pci-aardvark.c +++ b/drivers/pci/controller/pci-aardvark.c @@ -281,8 +281,6 @@ struct advk_pcie { @@ -36,7 +34,7 @@ index 4be05b52d835..c7bd6b123857 100644 struct msi_domain_info msi_domain_info; DECLARE_BITMAP(msi_used, MSI_IRQ_NUM); struct mutex msi_used_lock; -@@ -1197,6 +1195,12 @@ static int advk_msi_set_affinity(struct irq_data *irq_data, +@@ -1197,6 +1195,12 @@ static int advk_msi_set_affinity(struct return -EINVAL; } @@ -49,7 +47,7 @@ index 4be05b52d835..c7bd6b123857 100644 static int advk_msi_irq_domain_alloc(struct irq_domain *domain, unsigned int virq, unsigned int nr_irqs, void *args) -@@ -1213,7 +1217,7 @@ static int advk_msi_irq_domain_alloc(struct irq_domain *domain, +@@ -1213,7 +1217,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, @@ -58,7 +56,7 @@ index 4be05b52d835..c7bd6b123857 100644 domain->host_data, handle_simple_irq, NULL, NULL); -@@ -1283,29 +1287,23 @@ static const struct irq_domain_ops advk_pcie_irq_domain_ops = { +@@ -1283,29 +1287,23 @@ static const struct irq_domain_ops advk_ .xlate = irq_domain_xlate_onecell, }; @@ -93,6 +91,3 @@ index 4be05b52d835..c7bd6b123857 100644 msi_msg_phys = virt_to_phys(&pcie->msi_msg); --- -2.34.1 - |