5.15-stable patches

added patches:
	clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch

diff --git a/queue-5.15/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch b/queue-5.15/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch
new file mode 100644 (file)
index 0000000..946ee5d
--- /dev/null
+++ b/queue-5.15/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch
@@ -0,0 +1,42 @@
+From dbcfea91daaf046ac6a398cf79b272a1119148e6 Mon Sep 17 00:00:00 2001
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+Date: Thu, 30 Jun 2022 11:55:42 +0200
+Subject: clocksource/drivers/ixp4xx: remove __init from ixp4xx_timer_setup()
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+ixp4xx_timer_setup is exported, and so can not be an __init function.
+Remove the __init marking as the build system is rightfully claiming
+this is an error in older kernels.
+
+This is fixed "properly" in commit 41929c9f628b
+("clocksource/drivers/ixp4xx: Drop boardfile probe path") but that can
+not be backported to older kernels as the reworking of the IXP4xx
+codebase is not suitable for stable releases.
+
+Cc: Linus Walleij <linus.walleij@linaro.org>
+Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
+Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+---
+ drivers/clocksource/timer-ixp4xx.c | 5 ++---
+ 1 file changed, 2 insertions(+), 3 deletions(-)
+
+diff --git a/drivers/clocksource/timer-ixp4xx.c b/drivers/clocksource/timer-ixp4xx.c
+index 9396745e1c17..ab6f0f3193bc 100644
+--- a/drivers/clocksource/timer-ixp4xx.c
++++ b/drivers/clocksource/timer-ixp4xx.c
+@@ -245,9 +245,8 @@ static __init int ixp4xx_timer_register(void __iomem *base,
+  * @timer_irq: Linux IRQ number for the timer
+  * @timer_freq: Fixed frequency of the timer
+  */
+-void __init ixp4xx_timer_setup(resource_size_t timerbase,
+-                             int timer_irq,
+-                             unsigned int timer_freq)
++void ixp4xx_timer_setup(resource_size_t timerbase, int timer_irq,
++                      unsigned int timer_freq)
+ {
+       void __iomem *base;
+ 
+-- 
+2.37.0
+

diff --git a/queue-5.15/series b/queue-5.15/series
index 4c96f37a3dfc890b5db199c929201e7fed0cd8b0..205e665900a0a435f259c880c7fa5d9c6c306359 100644 (file)
--- a/queue-5.15/series
+++ b/queue-5.15/series
@@ -1 +1,2 @@
 tick-nohz-unexport-__init-annotated-tick_nohz_full_setup.patch
+clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch