summaryrefslogtreecommitdiffstats
path: root/debian/patches-rt/0227-cpu-hotplug-Implement-CPU-pinning.patch
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--debian/patches-rt/0227-cpu-hotplug-Implement-CPU-pinning.patch (renamed from debian/patches-rt/0228-cpu-hotplug-Implement-CPU-pinning.patch)22
1 files changed, 9 insertions, 13 deletions
diff --git a/debian/patches-rt/0228-cpu-hotplug-Implement-CPU-pinning.patch b/debian/patches-rt/0227-cpu-hotplug-Implement-CPU-pinning.patch
index 9a3b2430f..1a1ee7954 100644
--- a/debian/patches-rt/0228-cpu-hotplug-Implement-CPU-pinning.patch
+++ b/debian/patches-rt/0227-cpu-hotplug-Implement-CPU-pinning.patch
@@ -1,8 +1,7 @@
-From 784e4a9806842dc64aa0902210fe4e11984d868a Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@linutronix.de>
Date: Wed, 19 Jul 2017 17:31:20 +0200
-Subject: [PATCH 228/347] cpu/hotplug: Implement CPU pinning
-Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz
+Subject: [PATCH 227/342] cpu/hotplug: Implement CPU pinning
+Origin: https://git.kernel.org/cgit/linux/kernel/git/rt/linux-stable-rt.git/commit?id=6fa443c6c513b0e160a42bfbc0a4f3023fdf4edb
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
@@ -23,10 +22,10 @@ index 577045ae8693..7523c0786a63 100644
int migrate_disable_atomic;
# endif
diff --git a/kernel/cpu.c b/kernel/cpu.c
-index 89a96cc14b39..797216a0b4c6 100644
+index f4c49bbc3fa3..56cb58fce84c 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
-@@ -77,6 +77,11 @@ static DEFINE_PER_CPU(struct cpuhp_cpu_state, cpuhp_state) = {
+@@ -78,6 +78,11 @@ static DEFINE_PER_CPU(struct cpuhp_cpu_state, cpuhp_state) = {
.fail = CPUHP_INVALID,
};
@@ -38,7 +37,7 @@ index 89a96cc14b39..797216a0b4c6 100644
#if defined(CONFIG_LOCKDEP) && defined(CONFIG_SMP)
static struct lockdep_map cpuhp_state_up_map =
STATIC_LOCKDEP_MAP_INIT("cpuhp_state-up", &cpuhp_state_up_map);
-@@ -288,7 +293,28 @@ static int cpu_hotplug_disabled;
+@@ -289,7 +294,28 @@ static int cpu_hotplug_disabled;
*/
void pin_current_cpu(void)
{
@@ -67,7 +66,7 @@ index 89a96cc14b39..797216a0b4c6 100644
}
/**
-@@ -296,6 +322,13 @@ void pin_current_cpu(void)
+@@ -297,6 +323,13 @@ void pin_current_cpu(void)
*/
void unpin_current_cpu(void)
{
@@ -81,7 +80,7 @@ index 89a96cc14b39..797216a0b4c6 100644
}
DEFINE_STATIC_PERCPU_RWSEM(cpu_hotplug_lock);
-@@ -920,6 +953,7 @@ static int take_cpu_down(void *_param)
+@@ -921,6 +954,7 @@ static int take_cpu_down(void *_param)
static int takedown_cpu(unsigned int cpu)
{
@@ -89,7 +88,7 @@ index 89a96cc14b39..797216a0b4c6 100644
struct cpuhp_cpu_state *st = per_cpu_ptr(&cpuhp_state, cpu);
int err;
-@@ -932,11 +966,14 @@ static int takedown_cpu(unsigned int cpu)
+@@ -933,11 +967,14 @@ static int takedown_cpu(unsigned int cpu)
*/
irq_lock_sparse();
@@ -104,7 +103,7 @@ index 89a96cc14b39..797216a0b4c6 100644
/* CPU refused to die */
irq_unlock_sparse();
/* Unpark the hotplug thread so we can rollback there */
-@@ -955,6 +992,7 @@ static int takedown_cpu(unsigned int cpu)
+@@ -956,6 +993,7 @@ static int takedown_cpu(unsigned int cpu)
wait_for_ap_thread(st, false);
BUG_ON(st->state != CPUHP_AP_IDLE_DEAD);
@@ -112,6 +111,3 @@ index 89a96cc14b39..797216a0b4c6 100644
/* Interrupts are moved away from the dying cpu, reenable alloc/free */
irq_unlock_sparse();
---
-2.36.1
-