]> git.ipfire.org Git - thirdparty/kernel/stable-queue.git/commitdiff
5.15-stable patches
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Jul 2022 11:48:41 +0000 (13:48 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 5 Jul 2022 11:48:41 +0000 (13:48 +0200)
added patches:
clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch

queue-5.15/clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch [new file with mode: 0644]
queue-5.15/series

diff --git a/queue-5.15/clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch b/queue-5.15/clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch
new file mode 100644 (file)
index 0000000..1ab8881
--- /dev/null
@@ -0,0 +1,34 @@
+From 41355f2214cef6db6f2d485d9e080d1e69d7011c 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 EXPORT_SYMBOL_GPL from ixp4xx_timer_setup()
+
+From: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
+
+ixp4xx_timer_setup is exported, and so can not be an __init function.
+But it does not need to be exported as it is only called from one
+in-kernel function, so just remove the EXPORT_SYMBOL_GPL() marking to
+resolve the build warning.
+
+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 |    1 -
+ 1 file changed, 1 deletion(-)
+
+--- a/drivers/clocksource/timer-ixp4xx.c
++++ b/drivers/clocksource/timer-ixp4xx.c
+@@ -282,7 +282,6 @@ void __init ixp4xx_timer_setup(resource_
+       }
+       ixp4xx_timer_register(base, timer_irq, timer_freq);
+ }
+-EXPORT_SYMBOL_GPL(ixp4xx_timer_setup);
+ #ifdef CONFIG_OF
+ static __init int ixp4xx_of_timer_init(struct device_node *np)
index 0f372fe54cd5d8f2c3daf0309cc58f4de6a9c216..d246e699e3680f60178f7f7b932786e34b6edbb4 100644 (file)
@@ -82,6 +82,7 @@ xen-blkfront-force-data-bouncing-when-backend-is-untrusted.patch
 xen-netfront-restore-__skb_queue_tail-positioning-in-xennet_get_responses.patch
 xen-arm-fix-race-in-rb-tree-based-p2m-accounting.patch
 net-usb-qmi_wwan-add-telit-0x1070-composition.patch
+clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch
 net-fix-iff_tx_skb_no_linear-definition.patch
 drm-i915-gem-add-missing-else.patch
 drm-msm-gem-fix-error-return-on-fence-id-alloc-fail.patch