rebase patches on top of Ubuntu-5.15.0-16.16

[pve-kernel.git] / patches / kernel / 0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch

diff --git a/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch b/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch
index 7a39b4541909394fa1766eb89e9844e2a24dddc0..118131d51c69598587a03cc66f74fb76db11ca05 100644 (file)
--- a/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch
+++ b/patches/kernel/0007-PCI-Reinstate-PCI-Coalesce-host-bridge-contiguous-ap.patch
@@ -52,11 +52,11 @@ Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
 Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
 Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
 ---
- drivers/pci/probe.c | 33 ++++++++++++++++++++++++++++-----
- 1 file changed, 28 insertions(+), 5 deletions(-)
+ drivers/pci/probe.c | 31 +++++++++++++++++++++++++++----
+ 1 file changed, 27 insertions(+), 4 deletions(-)
 
 diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
-index d9fc02a71baa..3459f460dbd8 100644
+index 258350f80f6c..7ff9fcec365b 100644
 --- a/drivers/pci/probe.c
 +++ b/drivers/pci/probe.c
 @@ -883,11 +883,11 @@ static void pci_set_bus_msi_domain(struct pci_bus *bus)
@@ -100,14 +100,13 @@ index d9fc02a71baa..3459f460dbd8 100644
 +
        /* Add initial resources to the bus */
        resource_list_for_each_entry_safe(window, n, &resources) {
-+              offset = window->offset;
-+              res = window->res;
+-              list_move_tail(&window->node, &bridge->windows);
+               offset = window->offset;
+               res = window->res;
 +              if (!res->end)
 +                      continue;
 +
-               list_move_tail(&window->node, &bridge->windows);
--              offset = window->offset;
--              res = window->res;
++              list_move_tail(&window->node, &bridge->windows);
  
                if (res->flags & IORESOURCE_BUS)
                        pci_bus_insert_busn_res(bus, bus->number, res->end);