From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Date: Thu, 30 Jun 2022 10:00:22 +0000 (+0200)
Subject: 5.4-stable patches
X-Git-Tag: v4.9.321~34
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e9a5ab6e7689d57b3464b3cddb211a7c9c157918;p=thirdparty%2Fkernel%2Fstable-queue.git

5.4-stable patches

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

diff --git a/queue-5.4/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch b/queue-5.4/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch
new file mode 100644
index 00000000000..36647a14e15
--- /dev/null
+++ b/queue-5.4/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch
@@ -0,0 +1,37 @@
+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(-)
+
+--- a/drivers/clocksource/timer-ixp4xx.c
++++ b/drivers/clocksource/timer-ixp4xx.c
+@@ -245,9 +245,8 @@ static __init int ixp4xx_timer_register(
+  * @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;
+ 
diff --git a/queue-5.4/series b/queue-5.4/series
index 6c015009f46..87d6fdfcca0 100644
--- a/queue-5.4/series
+++ b/queue-5.4/series
@@ -1 +1,2 @@
 drm-remove-drm_fb_helper_modinit.patch
+clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch