linux58-rc-tkg: RC4
This commit is contained in:
@@ -6723,14 +6723,14 @@ index 000000000000..02d7d5a67c77
|
||||
+{
|
||||
+ struct mm_struct *mm = current->active_mm;
|
||||
+
|
||||
+ BUG_ON(cpu_online(smp_processor_id()));
|
||||
+ BUG_ON(current != this_rq()->idle);
|
||||
+
|
||||
+ if (mm != &init_mm) {
|
||||
+ switch_mm(mm, &init_mm, current);
|
||||
+ current->active_mm = &init_mm;
|
||||
+ finish_arch_post_lock_switch();
|
||||
+ }
|
||||
+ mmdrop(mm);
|
||||
+
|
||||
+ /* finish_cpu(), as ran on the BP, will clean up the active_mm state */
|
||||
+}
|
||||
+
|
||||
+/*
|
||||
@@ -8524,19 +8524,3 @@ index b5e3496cf803..0816db0b9c16 100644
|
||||
};
|
||||
struct wakeup_test_data *x = data;
|
||||
|
||||
diff --git a/kernel/cpu.c b/kernel/cpu.c
|
||||
index 244d305443773..90b77028233b0 100644
|
||||
--- a/kernel/cpu.c
|
||||
+++ b/kernel/cpu.c
|
||||
@@ -1565,7 +1565,11 @@ static struct cpuhp_step cpuhp_hp_states[] = {
|
||||
[CPUHP_BRINGUP_CPU] = {
|
||||
.name = "cpu:bringup",
|
||||
.startup.single = bringup_cpu,
|
||||
+#ifdef CONFIG_SCHED_PDS
|
||||
+ .teardown.single = NULL,
|
||||
+#else
|
||||
.teardown.single = finish_cpu,
|
||||
+#endif
|
||||
.cant_stop = true,
|
||||
},
|
||||
/* Final state before CPU kills itself */
|
||||
|
Reference in New Issue
Block a user