From c458479db46abeea30e1d92eba031fa86d5d96c9 Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Mon, 6 Sep 2021 10:34:30 +0200 Subject: [PATCH] 4.19-stable patches added patches: clk-fix-build-warning-for-orphan_list.patch --- ...lk-fix-build-warning-for-orphan_list.patch | 43 +++++++++++++++++++ queue-4.19/series | 1 + 2 files changed, 44 insertions(+) create mode 100644 queue-4.19/clk-fix-build-warning-for-orphan_list.patch diff --git a/queue-4.19/clk-fix-build-warning-for-orphan_list.patch b/queue-4.19/clk-fix-build-warning-for-orphan_list.patch new file mode 100644 index 00000000000..44eb1b032fa --- /dev/null +++ b/queue-4.19/clk-fix-build-warning-for-orphan_list.patch @@ -0,0 +1,43 @@ +From foo@baz Mon Sep 6 10:31:20 AM CEST 2021 +Date: Mon, 06 Sep 2021 10:31:20 +0200 +To: Greg KH +From: Greg Kroah-Hartman +Subject: [PATCH] clk: fix build warning for orphan_list + +In the backport of commit bdcf1dc25324 ("clk: Evict unregistered clks from +parent caches") to the 4.19.y and 4.14.y stable trees, the orphan_list structure was placed in the wrong location, causing loads of build warnings on systems that do not define CONFIG_DEBUG_FS. + +Fix this up by moving the structure to the correct place in the file. + +Reported-by: "kernelci.org bot" +Signed-off-by: Greg Kroah-Hartman +--- + drivers/clk/clk.c | 10 +++++----- + 1 file changed, 5 insertions(+), 5 deletions(-) + +--- a/drivers/clk/clk.c ++++ b/drivers/clk/clk.c +@@ -46,11 +46,6 @@ static struct hlist_head *all_lists[] = + NULL, + }; + +-static struct hlist_head *orphan_list[] = { +- &clk_orphan_list, +- NULL, +-}; +- + /*** private data structures ***/ + + struct clk_core { +@@ -2629,6 +2624,11 @@ static int inited = 0; + static DEFINE_MUTEX(clk_debug_lock); + static HLIST_HEAD(clk_debug_list); + ++static struct hlist_head *orphan_list[] = { ++ &clk_orphan_list, ++ NULL, ++}; ++ + static void clk_summary_show_one(struct seq_file *s, struct clk_core *c, + int level) + { diff --git a/queue-4.19/series b/queue-4.19/series index 4e6baa6d828..b019849017d 100644 --- a/queue-4.19/series +++ b/queue-4.19/series @@ -9,3 +9,4 @@ perf-x86-amd-ibs-work-around-erratum-1197.patch cryptoloop-add-a-deprecation-warning.patch arm-8918-2-only-build-return_address-if-needed.patch alsa-pcm-fix-divide-error-in-snd_pcm_lib_ioctl.patch +clk-fix-build-warning-for-orphan_list.patch -- 2.47.3