From 5e4b3b1e06e452c0b559ef89a629245339b4442c Mon Sep 17 00:00:00 2001 From: Tk-Glitch Date: Tue, 30 Jun 2020 01:46:40 +0200 Subject: [PATCH] linux58-rc-tkg: Sync our pds patchset with 44e2576a42d8b15240457e451dc3b761de0a9f9c changes --- linux58-rc-tkg/PKGBUILD | 2 +- .../0005-v5.8_undead-pds099o.patch | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) diff --git a/linux58-rc-tkg/PKGBUILD b/linux58-rc-tkg/PKGBUILD index 553f126..c4977d2 100644 --- a/linux58-rc-tkg/PKGBUILD +++ b/linux58-rc-tkg/PKGBUILD @@ -130,7 +130,7 @@ sha256sums=('3b983f9c93c791424e4d0894031625d1d6b5ec04ec09a09de0248b374329ef05' '7058e57fd68367b029adc77f2a82928f1433daaf02c8c279cb2d13556c8804d7' '62496f9ca788996181ef145f96ad26291282fcc3fb95cdc04080dcf84365be33' '7fd8e776209dac98627453fda754bdf9aff4a09f27cb0b3766d7983612eb3c74' - '709c93c6b7ae1f98711314d5eaec39f7f957472d45a39f0e3684bfd829d53a83' + 'eb98cd685c5f4428fa4d8c2250807eac386af49b252c4bc325ccc7d8a7216468' '19661ec0d39f9663452b34433214c755179894528bf73a42f6ba52ccf572832a' 'cd225e86d72eaf6c31ef3d7b20df397f4cc44ddd04389850691292cdf292b204' '49262ce4a8089fa70275aad742fc914baa28d9c384f710c9a62f64796d13e104') diff --git 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 index ca7213a..f634c60 100644 --- 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 */