rebase patches on top of Ubuntu-5.13.0-30.33

(generated with debian/scripts/import-upstream-tag)

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2022-02-07 10:58:28 +01:00
parent 194f0e8cd1
commit 5a9bd9e526
3 changed files with 19 additions and 23 deletions

View File

@ -15,8 +15,8 @@ Link: https://lore.kernel.org/r/20210709231529.GA3270116@roeck-us.net
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
drivers/pci/probe.c | 52 +++++---------------------------------------- drivers/pci/probe.c | 50 ++++-----------------------------------------
1 file changed, 5 insertions(+), 47 deletions(-) 1 file changed, 4 insertions(+), 46 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index 59ef93f1d953..b38a345c5df6 100644 index 59ef93f1d953..b38a345c5df6 100644
@ -92,14 +92,13 @@ index 59ef93f1d953..b38a345c5df6 100644
- -
/* Add initial resources to the bus */ /* Add initial resources to the bus */
resource_list_for_each_entry_safe(window, n, &resources) { resource_list_for_each_entry_safe(window, n, &resources) {
- offset = window->offset; + list_move_tail(&window->node, &bridge->windows);
- res = window->res; offset = window->offset;
res = window->res;
- if (!res->end) - if (!res->end)
- continue; - continue;
- -
list_move_tail(&window->node, &bridge->windows); - list_move_tail(&window->node, &bridge->windows);
+ offset = window->offset;
+ res = window->res;
if (res->flags & IORESOURCE_BUS) if (res->flags & IORESOURCE_BUS)
pci_bus_insert_busn_res(bus, bus->number, res->end); pci_bus_insert_busn_res(bus, bus->number, res->end);

View File

@ -52,8 +52,8 @@ Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com> Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
drivers/pci/probe.c | 33 ++++++++++++++++++++++++++++----- drivers/pci/probe.c | 31 +++++++++++++++++++++++++++----
1 file changed, 28 insertions(+), 5 deletions(-) 1 file changed, 27 insertions(+), 4 deletions(-)
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index b38a345c5df6..485167ca62a1 100644 index b38a345c5df6..485167ca62a1 100644
@ -100,14 +100,13 @@ index b38a345c5df6..485167ca62a1 100644
+ +
/* Add initial resources to the bus */ /* Add initial resources to the bus */
resource_list_for_each_entry_safe(window, n, &resources) { resource_list_for_each_entry_safe(window, n, &resources) {
+ offset = window->offset; - list_move_tail(&window->node, &bridge->windows);
+ res = window->res; offset = window->offset;
res = window->res;
+ if (!res->end) + if (!res->end)
+ continue; + continue;
+ +
list_move_tail(&window->node, &bridge->windows); + list_move_tail(&window->node, &bridge->windows);
- offset = window->offset;
- res = window->res;
if (res->flags & IORESOURCE_BUS) if (res->flags & IORESOURCE_BUS)
pci_bus_insert_busn_res(bus, bus->number, res->end); pci_bus_insert_busn_res(bus, bus->number, res->end);

View File

@ -19,8 +19,8 @@ Signed-off-by: Jens Axboe <axboe@kernel.dk>
Signed-off-by: Fabian Ebner <f.ebner@proxmox.com> Signed-off-by: Fabian Ebner <f.ebner@proxmox.com>
Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com> Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
--- ---
fs/io-wq.c | 160 +++++++++++++++++++++++------------------------------ fs/io-wq.c | 158 +++++++++++++++++++++++------------------------------
1 file changed, 70 insertions(+), 90 deletions(-) 1 file changed, 69 insertions(+), 89 deletions(-)
diff --git a/fs/io-wq.c b/fs/io-wq.c diff --git a/fs/io-wq.c b/fs/io-wq.c
index ba7aaf2b95d0..6710da3d4445 100644 index ba7aaf2b95d0..6710da3d4445 100644
@ -35,7 +35,7 @@ index ba7aaf2b95d0..6710da3d4445 100644
}; };
/* /*
@@ -73,26 +73,25 @@ struct io_wqe_acct { @@ -73,25 +73,24 @@ struct io_wqe_acct {
unsigned max_workers; unsigned max_workers;
int index; int index;
atomic_t nr_running; atomic_t nr_running;
@ -58,16 +58,14 @@ index ba7aaf2b95d0..6710da3d4445 100644
- struct io_wq_work_list work_list; - struct io_wq_work_list work_list;
- unsigned flags; - unsigned flags;
- } ____cacheline_aligned_in_smp; - } ____cacheline_aligned_in_smp;
-
- int node;
+ raw_spinlock_t lock; + raw_spinlock_t lock;
struct io_wqe_acct acct[2]; + struct io_wqe_acct acct[2];
int node;
- struct io_wqe_acct acct[2];
+ int node;
+
struct hlist_nulls_head free_list; struct hlist_nulls_head free_list;
struct list_head all_list; struct list_head all_list;
@@ -196,11 +195,10 @@ static void io_worker_exit(struct io_worker *worker) @@ -196,11 +195,10 @@ static void io_worker_exit(struct io_worker *worker)
do_exit(0); do_exit(0);
} }