From: Greg Kroah-Hartman Date: Sat, 2 Jul 2022 14:08:13 +0000 (+0200) Subject: drop clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch from... X-Git-Tag: v4.9.321~1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=f08f58821b587911e824d2f76d6c6591b0198618;p=thirdparty%2Fkernel%2Fstable-queue.git drop clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch from everywhere We can do this simpler, and it still caused build warnings... --- diff --git a/queue-5.10/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch b/queue-5.10/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch deleted file mode 100644 index e5399aba9dd..00000000000 --- a/queue-5.10/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch +++ /dev/null @@ -1,75 +0,0 @@ -From dbcfea91daaf046ac6a398cf79b272a1119148e6 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 __init from ixp4xx_timer_setup() - -From: Greg Kroah-Hartman - -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 -Cc: Daniel Lezcano -Signed-off-by: Greg Kroah-Hartman ---- - drivers/clocksource/mmio.c | 2 +- - drivers/clocksource/timer-ixp4xx.c | 10 ++++------ - include/linux/platform_data/timer-ixp4xx.h | 5 ++--- - 3 files changed, 7 insertions(+), 10 deletions(-) - ---- a/drivers/clocksource/mmio.c -+++ b/drivers/clocksource/mmio.c -@@ -46,7 +46,7 @@ u64 clocksource_mmio_readw_down(struct c - * @bits: Number of valid bits - * @read: One of clocksource_mmio_read*() above - */ --int __init clocksource_mmio_init(void __iomem *base, const char *name, -+int clocksource_mmio_init(void __iomem *base, const char *name, - unsigned long hz, int rating, unsigned bits, - u64 (*read)(struct clocksource *)) - { ---- a/drivers/clocksource/timer-ixp4xx.c -+++ b/drivers/clocksource/timer-ixp4xx.c -@@ -170,9 +170,8 @@ static int ixp4xx_resume(struct clock_ev - * We use OS timer1 on the CPU for the timer tick and the timestamp - * counter as a source of real clock ticks to account for missed jiffies. - */ --static __init int ixp4xx_timer_register(void __iomem *base, -- int timer_irq, -- unsigned int timer_freq) -+static int ixp4xx_timer_register(void __iomem *base, int timer_irq, -+ unsigned int timer_freq) - { - struct ixp4xx_timer *tmr; - int ret; -@@ -245,9 +244,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; - ---- a/include/linux/platform_data/timer-ixp4xx.h -+++ b/include/linux/platform_data/timer-ixp4xx.h -@@ -4,8 +4,7 @@ - - #include - --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); - - #endif diff --git a/queue-5.10/series b/queue-5.10/series index 1ca9d8cc979..9d30604c9e9 100644 --- a/queue-5.10/series +++ b/queue-5.10/series @@ -1,7 +1,6 @@ maintainers-add-amir-as-xfs-maintainer-for-5.10.y.patch drm-remove-drm_fb_helper_modinit.patch tick-nohz-unexport-__init-annotated-tick_nohz_full_setup.patch -clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch bcache-memset-on-stack-variables-in-bch_btree_check-and-bch_sectors_dirty_init.patch xfs-use-kmem_cache_free-for-kmem_cache-objects.patch xfs-punch-out-data-fork-delalloc-blocks-on-cow-writeback-failure.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 deleted file mode 100644 index d0731ee1342..00000000000 --- a/queue-5.15/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch +++ /dev/null @@ -1,75 +0,0 @@ -From dbcfea91daaf046ac6a398cf79b272a1119148e6 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 __init from ixp4xx_timer_setup() - -From: Greg Kroah-Hartman - -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 -Cc: Daniel Lezcano -Signed-off-by: Greg Kroah-Hartman ---- - drivers/clocksource/mmio.c | 2 +- - drivers/clocksource/timer-ixp4xx.c | 10 ++++------ - include/linux/platform_data/timer-ixp4xx.h | 5 ++--- - 3 files changed, 7 insertions(+), 10 deletions(-) - ---- a/drivers/clocksource/mmio.c -+++ b/drivers/clocksource/mmio.c -@@ -46,7 +46,7 @@ u64 clocksource_mmio_readw_down(struct c - * @bits: Number of valid bits - * @read: One of clocksource_mmio_read*() above - */ --int __init clocksource_mmio_init(void __iomem *base, const char *name, -+int clocksource_mmio_init(void __iomem *base, const char *name, - unsigned long hz, int rating, unsigned bits, - u64 (*read)(struct clocksource *)) - { ---- a/drivers/clocksource/timer-ixp4xx.c -+++ b/drivers/clocksource/timer-ixp4xx.c -@@ -161,9 +161,8 @@ static int ixp4xx_resume(struct clock_ev - * We use OS timer1 on the CPU for the timer tick and the timestamp - * counter as a source of real clock ticks to account for missed jiffies. - */ --static __init int ixp4xx_timer_register(void __iomem *base, -- int timer_irq, -- unsigned int timer_freq) -+static int ixp4xx_timer_register(void __iomem *base, int timer_irq, -+ unsigned int timer_freq) - { - struct ixp4xx_timer *tmr; - int ret; -@@ -269,9 +268,8 @@ builtin_platform_driver(ixp4xx_timer_dri - * @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; - ---- a/include/linux/platform_data/timer-ixp4xx.h -+++ b/include/linux/platform_data/timer-ixp4xx.h -@@ -4,8 +4,7 @@ - - #include - --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); - - #endif diff --git a/queue-5.15/series b/queue-5.15/series index ed72f5aaa94..7754fe9ed8f 100644 --- a/queue-5.15/series +++ b/queue-5.15/series @@ -1,5 +1,4 @@ tick-nohz-unexport-__init-annotated-tick_nohz_full_setup.patch -clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch x86-kvm-use-proper-asm-macros-for-kvm_vcpu_is_preempted.patch bcache-memset-on-stack-variables-in-bch_btree_check-and-bch_sectors_dirty_init.patch xfs-use-kmem_cache_free-for-kmem_cache-objects.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 deleted file mode 100644 index e5399aba9dd..00000000000 --- a/queue-5.4/clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch +++ /dev/null @@ -1,75 +0,0 @@ -From dbcfea91daaf046ac6a398cf79b272a1119148e6 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 __init from ixp4xx_timer_setup() - -From: Greg Kroah-Hartman - -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 -Cc: Daniel Lezcano -Signed-off-by: Greg Kroah-Hartman ---- - drivers/clocksource/mmio.c | 2 +- - drivers/clocksource/timer-ixp4xx.c | 10 ++++------ - include/linux/platform_data/timer-ixp4xx.h | 5 ++--- - 3 files changed, 7 insertions(+), 10 deletions(-) - ---- a/drivers/clocksource/mmio.c -+++ b/drivers/clocksource/mmio.c -@@ -46,7 +46,7 @@ u64 clocksource_mmio_readw_down(struct c - * @bits: Number of valid bits - * @read: One of clocksource_mmio_read*() above - */ --int __init clocksource_mmio_init(void __iomem *base, const char *name, -+int clocksource_mmio_init(void __iomem *base, const char *name, - unsigned long hz, int rating, unsigned bits, - u64 (*read)(struct clocksource *)) - { ---- a/drivers/clocksource/timer-ixp4xx.c -+++ b/drivers/clocksource/timer-ixp4xx.c -@@ -170,9 +170,8 @@ static int ixp4xx_resume(struct clock_ev - * We use OS timer1 on the CPU for the timer tick and the timestamp - * counter as a source of real clock ticks to account for missed jiffies. - */ --static __init int ixp4xx_timer_register(void __iomem *base, -- int timer_irq, -- unsigned int timer_freq) -+static int ixp4xx_timer_register(void __iomem *base, int timer_irq, -+ unsigned int timer_freq) - { - struct ixp4xx_timer *tmr; - int ret; -@@ -245,9 +244,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; - ---- a/include/linux/platform_data/timer-ixp4xx.h -+++ b/include/linux/platform_data/timer-ixp4xx.h -@@ -4,8 +4,7 @@ - - #include - --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); - - #endif diff --git a/queue-5.4/series b/queue-5.4/series index 59e5a95985f..c8fefd46381 100644 --- a/queue-5.4/series +++ b/queue-5.4/series @@ -1,5 +1,4 @@ drm-remove-drm_fb_helper_modinit.patch -clocksource-drivers-ixp4xx-remove-__init-from-ixp4xx_timer_setup.patch powerpc-ftrace-remove-ftrace-init-tramp-once-kernel-init-is-complete.patch kexec_file-drop-weak-attribute-from-arch_kexec_apply_relocations.patch net-mscc-ocelot-allow-unregistered-ip-multicast-flooding.patch