blob: 2132d259adb37daf3d6d5b587571b300068b20b3 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
From 01f24622e993de73c028f4eaa067c421e4e0d851 Mon Sep 17 00:00:00 2001
From: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Date: Fri, 29 Nov 2019 17:24:55 +0100
Subject: [PATCH 312/347] sched/core: migrate_enable() must access
takedown_cpu_task on !HOTPLUG_CPU
Origin: https://www.kernel.org/pub/linux/kernel/projects/rt/4.19/older/patches-4.19.246-rt110.tar.xz
[ Upstream commit a61d1977f692e46bad99a100f264981ba08cb4bd ]
The variable takedown_cpu_task is never declared/used on !HOTPLUG_CPU
except for migrate_enable(). This leads to a link error.
Don't use takedown_cpu_task in !HOTPLUG_CPU.
Reported-by: Dick Hollenbeck <dick@softplc.com>
Signed-off-by: Sebastian Andrzej Siewior <bigeasy@linutronix.de>
Signed-off-by: Steven Rostedt (VMware) <rostedt@goodmis.org>
---
kernel/cpu.c | 2 ++
kernel/sched/core.c | 2 ++
2 files changed, 4 insertions(+)
diff --git a/kernel/cpu.c b/kernel/cpu.c
index edd4fd8da726..44245b35c09c 100644
--- a/kernel/cpu.c
+++ b/kernel/cpu.c
@@ -912,7 +912,9 @@ static int take_cpu_down(void *_param)
return 0;
}
+#ifdef CONFIG_PREEMPT_RT_BASE
struct task_struct *takedown_cpu_task;
+#endif
static int takedown_cpu(unsigned int cpu)
{
diff --git a/kernel/sched/core.c b/kernel/sched/core.c
index dff9d26a8625..270adb525d93 100644
--- a/kernel/sched/core.c
+++ b/kernel/sched/core.c
@@ -7308,9 +7308,11 @@ void migrate_enable(void)
p->migrate_disable = 0;
rq->nr_pinned--;
+#ifdef CONFIG_HOTPLUG_CPU
if (rq->nr_pinned == 0 && unlikely(!cpu_active(cpu)) &&
takedown_cpu_task)
wake_up_process(takedown_cpu_task);
+#endif
if (!p->migrate_disable_scheduled)
goto out;
--
2.36.1
|
