diff options
author | Salvatore Bonaccorso <carnil@debian.org> | 2019-12-18 18:06:31 +0100 |
---|---|---|
committer | Salvatore Bonaccorso <carnil@debian.org> | 2019-12-18 22:50:21 +0100 |
commit | 102987a83771aa994821d4d982d06faa64c789e4 (patch) | |
tree | 3e5ab5206886ec297a1a97ce80f504d75468ed2f /debian/patches-rt/workqueue-Remove-GPF-argument-from-alloc_workqueue_a.patch | |
parent | 479cb120ecb2b3f2c4d929a7b57860248d6f79bd (diff) | |
download | linux-debian-102987a83771aa994821d4d982d06faa64c789e4.tar.gz |
[rt] Update to 5.4.3-rt1 and re-enable
Adjust for context changes due to backport of
e66b39af00f4 ("workqueue: Fix pwq ref leak in rescuer_thread()") and
def98c84b6cd ("workqueue: Fix spurious sanity check failures in
destroy_workqueue()") in 5.4.4.
Diffstat (limited to 'debian/patches-rt/workqueue-Remove-GPF-argument-from-alloc_workqueue_a.patch')
-rw-r--r-- | debian/patches-rt/workqueue-Remove-GPF-argument-from-alloc_workqueue_a.patch | 106 |
1 files changed, 0 insertions, 106 deletions
diff --git a/debian/patches-rt/workqueue-Remove-GPF-argument-from-alloc_workqueue_a.patch b/debian/patches-rt/workqueue-Remove-GPF-argument-from-alloc_workqueue_a.patch deleted file mode 100644 index de76e600e..000000000 --- a/debian/patches-rt/workqueue-Remove-GPF-argument-from-alloc_workqueue_a.patch +++ /dev/null @@ -1,106 +0,0 @@ -From: Thomas Gleixner <tglx@linutronix.de> -Date: Tue, 21 May 2019 16:39:56 +0200 -Subject: [PATCH] workqueue: Remove GPF argument from - alloc_workqueue_attrs() -Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.2/older/patches-5.2.17-rt9.tar.xz - -All callers use GFP_KERNEL. No point in having that argument. - -Signed-off-by: Thomas Gleixner <tglx@linutronix.de> -Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> ---- - kernel/workqueue.c | 23 +++++++++++------------ - 1 file changed, 11 insertions(+), 12 deletions(-) - ---- a/kernel/workqueue.c -+++ b/kernel/workqueue.c -@@ -3339,21 +3339,20 @@ static void free_workqueue_attrs(struct - - /** - * alloc_workqueue_attrs - allocate a workqueue_attrs -- * @gfp_mask: allocation mask to use - * - * Allocate a new workqueue_attrs, initialize with default settings and - * return it. - * - * Return: The allocated new workqueue_attr on success. %NULL on failure. - */ --static struct workqueue_attrs *alloc_workqueue_attrs(gfp_t gfp_mask) -+static struct workqueue_attrs *alloc_workqueue_attrs(void) - { - struct workqueue_attrs *attrs; - -- attrs = kzalloc(sizeof(*attrs), gfp_mask); -+ attrs = kzalloc(sizeof(*attrs), GFP_KERNEL); - if (!attrs) - goto fail; -- if (!alloc_cpumask_var(&attrs->cpumask, gfp_mask)) -+ if (!alloc_cpumask_var(&attrs->cpumask, GFP_KERNEL)) - goto fail; - - cpumask_copy(attrs->cpumask, cpu_possible_mask); -@@ -3431,7 +3430,7 @@ static int init_worker_pool(struct worke - pool->refcnt = 1; - - /* shouldn't fail above this point */ -- pool->attrs = alloc_workqueue_attrs(GFP_KERNEL); -+ pool->attrs = alloc_workqueue_attrs(); - if (!pool->attrs) - return -ENOMEM; - return 0; -@@ -3896,8 +3895,8 @@ apply_wqattrs_prepare(struct workqueue_s - - ctx = kzalloc(struct_size(ctx, pwq_tbl, nr_node_ids), GFP_KERNEL); - -- new_attrs = alloc_workqueue_attrs(GFP_KERNEL); -- tmp_attrs = alloc_workqueue_attrs(GFP_KERNEL); -+ new_attrs = alloc_workqueue_attrs(); -+ tmp_attrs = alloc_workqueue_attrs(); - if (!ctx || !new_attrs || !tmp_attrs) - goto out_free; - -@@ -4241,7 +4240,7 @@ struct workqueue_struct *alloc_workqueue - return NULL; - - if (flags & WQ_UNBOUND) { -- wq->unbound_attrs = alloc_workqueue_attrs(GFP_KERNEL); -+ wq->unbound_attrs = alloc_workqueue_attrs(); - if (!wq->unbound_attrs) - goto err_free_wq; - } -@@ -5394,7 +5393,7 @@ static struct workqueue_attrs *wq_sysfs_ - - lockdep_assert_held(&wq_pool_mutex); - -- attrs = alloc_workqueue_attrs(GFP_KERNEL); -+ attrs = alloc_workqueue_attrs(); - if (!attrs) - return NULL; - -@@ -5816,7 +5815,7 @@ static void __init wq_numa_init(void) - return; - } - -- wq_update_unbound_numa_attrs_buf = alloc_workqueue_attrs(GFP_KERNEL); -+ wq_update_unbound_numa_attrs_buf = alloc_workqueue_attrs(); - BUG_ON(!wq_update_unbound_numa_attrs_buf); - - /* -@@ -5891,7 +5890,7 @@ int __init workqueue_init_early(void) - for (i = 0; i < NR_STD_WORKER_POOLS; i++) { - struct workqueue_attrs *attrs; - -- BUG_ON(!(attrs = alloc_workqueue_attrs(GFP_KERNEL))); -+ BUG_ON(!(attrs = alloc_workqueue_attrs())); - attrs->nice = std_nice[i]; - unbound_std_wq_attrs[i] = attrs; - -@@ -5900,7 +5899,7 @@ int __init workqueue_init_early(void) - * guaranteed by max_active which is enforced by pwqs. - * Turn off NUMA so that dfl_pwq is used for all nodes. - */ -- BUG_ON(!(attrs = alloc_workqueue_attrs(GFP_KERNEL))); -+ BUG_ON(!(attrs = alloc_workqueue_attrs())); - attrs->nice = std_nice[i]; - attrs->no_numa = true; - ordered_wq_attrs[i] = attrs; |