From: Greg Kroah-Hartman Date: Tue, 20 Feb 2018 09:26:57 +0000 (+0100) Subject: 4.15-stable patches X-Git-Tag: v4.15.5~35 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=d9ea9af4304f4c7cea6b99e4eea6c11d9f740fdc;p=thirdparty%2Fkernel%2Fstable-queue.git 4.15-stable patches added patches: pm-cpuidle-fix-cpuidle_poll_state_init-prototype.patch pm-runtime-update-links_count-also-if-config_srcu.patch --- diff --git a/queue-4.15/pm-cpuidle-fix-cpuidle_poll_state_init-prototype.patch b/queue-4.15/pm-cpuidle-fix-cpuidle_poll_state_init-prototype.patch new file mode 100644 index 00000000000..61dffba76cc --- /dev/null +++ b/queue-4.15/pm-cpuidle-fix-cpuidle_poll_state_init-prototype.patch @@ -0,0 +1,34 @@ +From d7212cfb05ba802bea4dd6c90d61cfe6366ea224 Mon Sep 17 00:00:00 2001 +From: "Rafael J. Wysocki" +Date: Mon, 12 Feb 2018 11:34:22 +0100 +Subject: PM: cpuidle: Fix cpuidle_poll_state_init() prototype + +From: Rafael J. Wysocki + +commit d7212cfb05ba802bea4dd6c90d61cfe6366ea224 upstream. + +Commit f85942207516 (x86: PM: Make APM idle driver initialize polling +state) made apm_init() call cpuidle_poll_state_init(), but that only +is defined for CONFIG_CPU_IDLE set, so make the empty stub of it +available for CONFIG_CPU_IDLE unset too to fix the resulting build +issue. + +Fixes: f85942207516 (x86: PM: Make APM idle driver initialize polling state) +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + include/linux/cpuidle.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +--- a/include/linux/cpuidle.h ++++ b/include/linux/cpuidle.h +@@ -225,7 +225,7 @@ static inline void cpuidle_coupled_paral + } + #endif + +-#ifdef CONFIG_ARCH_HAS_CPU_RELAX ++#if defined(CONFIG_CPU_IDLE) && defined(CONFIG_ARCH_HAS_CPU_RELAX) + void cpuidle_poll_state_init(struct cpuidle_driver *drv); + #else + static inline void cpuidle_poll_state_init(struct cpuidle_driver *drv) {} diff --git a/queue-4.15/pm-runtime-update-links_count-also-if-config_srcu.patch b/queue-4.15/pm-runtime-update-links_count-also-if-config_srcu.patch new file mode 100644 index 00000000000..226355a1852 --- /dev/null +++ b/queue-4.15/pm-runtime-update-links_count-also-if-config_srcu.patch @@ -0,0 +1,36 @@ +From 433986c2c265d106d6a8e88006e0131fefc92b7b Mon Sep 17 00:00:00 2001 +From: Lukas Wunner +Date: Sat, 10 Feb 2018 19:13:58 +0100 +Subject: PM / runtime: Update links_count also if !CONFIG_SRCU + +From: Lukas Wunner + +commit 433986c2c265d106d6a8e88006e0131fefc92b7b upstream. + +Commit baa8809f6097 (PM / runtime: Optimize the use of device links) +added an invocation of pm_runtime_drop_link() to __device_link_del(). +However there are two variants of that function, one for CONFIG_SRCU and +another for !CONFIG_SRCU, and the commit only modified the former. + +Fixes: baa8809f6097 (PM / runtime: Optimize the use of device links) +Cc: v4.10+ # v4.10+ +Signed-off-by: Lukas Wunner +Signed-off-by: Rafael J. Wysocki +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/base/core.c | 3 +++ + 1 file changed, 3 insertions(+) + +--- a/drivers/base/core.c ++++ b/drivers/base/core.c +@@ -313,6 +313,9 @@ static void __device_link_del(struct dev + dev_info(link->consumer, "Dropping the link to %s\n", + dev_name(link->supplier)); + ++ if (link->flags & DL_FLAG_PM_RUNTIME) ++ pm_runtime_drop_link(link->consumer); ++ + list_del(&link->s_node); + list_del(&link->c_node); + device_link_free(link); diff --git a/queue-4.15/series b/queue-4.15/series index 0695980897c..65486ea10a0 100644 --- a/queue-4.15/series +++ b/queue-4.15/series @@ -52,3 +52,5 @@ kvm-x86-reduce-retpoline-performance-impact-in-slot_handle_level_range-by-always x86-nvmx-properly-set-spec_ctrl-and-pred_cmd-before-merging-msrs.patch kvm-nvmx-set-the-cpu_based_use_msr_bitmaps-if-we-have-a-valid-l02-msr-bitmap.patch x86-speculation-clean-up-various-spectre-related-details.patch +pm-runtime-update-links_count-also-if-config_srcu.patch +pm-cpuidle-fix-cpuidle_poll_state_init-prototype.patch