From: Greg Kroah-Hartman Date: Tue, 5 Jul 2022 11:48:29 +0000 (+0200) Subject: 5.4-stable patches X-Git-Tag: v4.9.322~7 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=585b5831d9b648f47ae7b843e1dacaa09519eefa;p=thirdparty%2Fkernel%2Fstable-queue.git 5.4-stable patches added patches: clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch --- diff --git a/queue-5.4/clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch b/queue-5.4/clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch new file mode 100644 index 00000000000..23130cded1e --- /dev/null +++ b/queue-5.4/clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch @@ -0,0 +1,34 @@ +From 41355f2214cef6db6f2d485d9e080d1e69d7011c Mon Sep 17 00:00:00 2001 +From: Greg Kroah-Hartman +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 + +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 +Cc: Daniel Lezcano +Signed-off-by: Greg Kroah-Hartman +--- + drivers/clocksource/timer-ixp4xx.c | 1 - + 1 file changed, 1 deletion(-) + +--- a/drivers/clocksource/timer-ixp4xx.c ++++ b/drivers/clocksource/timer-ixp4xx.c +@@ -258,7 +258,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) diff --git a/queue-5.4/series b/queue-5.4/series index c3b547d2331..9bc3e086152 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -55,3 +55,4 @@ xen-blkfront-force-data-bouncing-when-backend-is-untrusted.patch xen-arm-fix-race-in-rb-tree-based-p2m-accounting.patch net-usb-qmi_wwan-add-telit-0x1060-composition.patch net-usb-qmi_wwan-add-telit-0x1070-composition.patch +clocksource-drivers-ixp4xx-remove-export_symbol_gpl-from-ixp4xx_timer_setup.patch