diff options
Diffstat (limited to 'debian/patches-rt/0311-stop_machine-Remove-this_cpu_ptr-from-print_stop_inf.patch')
| -rw-r--r-- | debian/patches-rt/0311-stop_machine-Remove-this_cpu_ptr-from-print_stop_inf.patch | 38 |
1 files changed, 38 insertions, 0 deletions
diff --git a/debian/patches-rt/0311-stop_machine-Remove-this_cpu_ptr-from-print_stop_inf.patch b/debian/patches-rt/0311-stop_machine-Remove-this_cpu_ptr-from-print_stop_inf.patch new file mode 100644 index 000000000..653909e6e --- /dev/null +++ b/debian/patches-rt/0311-stop_machine-Remove-this_cpu_ptr-from-print_stop_inf.patch @@ -0,0 +1,38 @@ +From ce2910a453196930e7083aaf13240adcec160afd Mon Sep 17 00:00:00 2001 +From: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +Date: Fri, 17 Dec 2021 11:32:08 +0100 +Subject: [PATCH 311/323] stop_machine: Remove this_cpu_ptr() from + print_stop_info(). +Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/5.10/older/patches-5.10.204-rt100.tar.xz + +This aligns the patch ("stop_machine: Add function and caller debug +info) with commit + a8b62fd085050 ("stop_machine: Add function and caller debug info") + +that was merged upstream and is slightly different. + +Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de> +--- + kernel/stop_machine.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/kernel/stop_machine.c b/kernel/stop_machine.c +index dbf585cf4b9f..971d8acceaec 100644 +--- a/kernel/stop_machine.c ++++ b/kernel/stop_machine.c +@@ -51,7 +51,11 @@ static bool stop_machine_initialized = false; + + void print_stop_info(const char *log_lvl, struct task_struct *task) + { +- struct cpu_stopper *stopper = this_cpu_ptr(&cpu_stopper); ++ /* ++ * If @task is a stopper task, it cannot migrate and task_cpu() is ++ * stable. ++ */ ++ struct cpu_stopper *stopper = per_cpu_ptr(&cpu_stopper, task_cpu(task)); + + if (task != stopper->thread) + return; +-- +2.43.0 + |