]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
4.19-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Sep 2021 08:34:30 +0000 (10:34 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 6 Sep 2021 08:34:30 +0000 (10:34 +0200)
added patches:
clk-fix-build-warning-for-orphan_list.patch

queue-4.19/clk-fix-build-warning-for-orphan_list.patch [new file with mode: 0644]
queue-4.19/series

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 (file)
index 0000000..44eb1b0
--- /dev/null
@@ -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 <gregkh@linuxfoundation.org>
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+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" <bot@kernelci.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ 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)
+ {
index 4e6baa6d8289d71f2e363d50bb0bcae5a6e46580..b019849017dbec0e7c33fbdc01380d7233656687 100644 (file)
@@ -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