summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0233-mm-vmalloc-Another-preempt-disable-region-which-suck.patch
diff options
context:
space:
mode:
Diffstat (limited to 'debian/patches-rt/0233-mm-vmalloc-Another-preempt-disable-region-which-suck.patch')
-rw-r--r--debian/patches-rt/0233-mm-vmalloc-Another-preempt-disable-region-which-suck.patch73
1 files changed, 0 insertions, 73 deletions
diff --git a/debian/patches-rt/0233-mm-vmalloc-Another-preempt-disable-region-which-suck.patch b/debian/patches-rt/0233-mm-vmalloc-Another-preempt-disable-region-which-suck.patch
deleted file mode 100644
index 44a18448f..000000000
--- a/debian/patches-rt/0233-mm-vmalloc-Another-preempt-disable-region-which-suck.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 80953e63313bfe698c24fa8a8a90a9f34c0e1f21 Mon Sep 17 00:00:00 2001
-From: Thomas Gleixner <tglx@linutronix.de>
-Date: Tue, 12 Jul 2011 11:39:36 +0200
-Subject: [PATCH 233/296] mm/vmalloc: Another preempt disable region which
- sucks
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.35-rt39.tar.xz
-
-Avoid the preempt disable version of get_cpu_var(). The inner-lock should
-provide enough serialisation.
-
-Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
----
- mm/vmalloc.c | 13 ++++++++-----
- 1 file changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/mm/vmalloc.c b/mm/vmalloc.c
-index fff03a331314..2cbbbdb69ec4 100644
---- a/mm/vmalloc.c
-+++ b/mm/vmalloc.c
-@@ -1542,7 +1542,7 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
- struct vmap_block *vb;
- struct vmap_area *va;
- unsigned long vb_idx;
-- int node, err;
-+ int node, err, cpu;
- void *vaddr;
-
- node = numa_node_id();
-@@ -1579,11 +1579,12 @@ static void *new_vmap_block(unsigned int order, gfp_t gfp_mask)
- return ERR_PTR(err);
- }
-
-- vbq = &get_cpu_var(vmap_block_queue);
-+ cpu = get_cpu_light();
-+ vbq = this_cpu_ptr(&vmap_block_queue);
- spin_lock(&vbq->lock);
- list_add_tail_rcu(&vb->free_list, &vbq->free);
- spin_unlock(&vbq->lock);
-- put_cpu_var(vmap_block_queue);
-+ put_cpu_light();
-
- return vaddr;
- }
-@@ -1648,6 +1649,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
- struct vmap_block *vb;
- void *vaddr = NULL;
- unsigned int order;
-+ int cpu;
-
- BUG_ON(offset_in_page(size));
- BUG_ON(size > PAGE_SIZE*VMAP_MAX_ALLOC);
-@@ -1662,7 +1664,8 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
- order = get_order(size);
-
- rcu_read_lock();
-- vbq = &get_cpu_var(vmap_block_queue);
-+ cpu = get_cpu_light();
-+ vbq = this_cpu_ptr(&vmap_block_queue);
- list_for_each_entry_rcu(vb, &vbq->free, free_list) {
- unsigned long pages_off;
-
-@@ -1685,7 +1688,7 @@ static void *vb_alloc(unsigned long size, gfp_t gfp_mask)
- break;
- }
-
-- put_cpu_var(vmap_block_queue);
-+ put_cpu_light();
- rcu_read_unlock();
-
- /* Allocate new block if nothing was found */
---
-2.30.2
-