linux58-rc-tkg: Sync our pds patchset with 44e2576a42 changes

2020-06-30 01:46:40 +02:00
parent 44e2576a42
commit 5e4b3b1e06
2 changed files with 17 additions and 1 deletions
--- a/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch
+++ b/linux58-rc-tkg/linux58-tkg-patches/0005-v5.8_undead-pds099o.patch
@@ -8524,3 +8524,19 @@ 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 */