This is a note to let you know that I've just added the patch titled
sparc/cpu: Switch to arch_cpu_finalize_init()
to the 5.4-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
sparc-cpu-switch-to-arch_cpu_finalize_init.patch
and it can be found in the queue-5.4 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From e7a2caf480097e1131b5239e95083c3e8995be07 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Wed, 14 Jun 2023 01:39:35 +0200
Subject: sparc/cpu: Switch to arch_cpu_finalize_init()
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 44ade508e3bfac45ae97864587de29eb1a881ec0 upstream
check_bugs() is about to be phased out. Switch over to the new
arch_cpu_finalize_init() implementation.
No functional change.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Sam Ravnborg <sam@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230613224545.431995857@xxxxxxxxxxxxx
Signed-off-by: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/sparc/Kconfig | 1 +
arch/sparc/include/asm/bugs.h | 18 ------------------
arch/sparc/kernel/setup_32.c | 7 +++++++
3 files changed, 8 insertions(+), 18 deletions(-)
delete mode 100644 arch/sparc/include/asm/bugs.h
--- a/arch/sparc/Kconfig
+++ b/arch/sparc/Kconfig
@@ -52,6 +52,7 @@ config SPARC
config SPARC32
def_bool !64BIT
select ARCH_32BIT_OFF_T
+ select ARCH_HAS_CPU_FINALIZE_INIT if !SMP
select ARCH_HAS_SYNC_DMA_FOR_CPU
select GENERIC_ATOMIC64
select CLZ_TAB
--- a/arch/sparc/include/asm/bugs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/* include/asm/bugs.h: Sparc probes for various bugs.
- *
- * Copyright (C) 1996, 2007 David S. Miller (davem@xxxxxxxxxxxxx)
- */
-
-#ifdef CONFIG_SPARC32
-#include <asm/cpudata.h>
-#endif
-
-extern unsigned long loops_per_jiffy;
-
-static void __init check_bugs(void)
-{
-#if defined(CONFIG_SPARC32) && !defined(CONFIG_SMP)
- cpu_data(0).udelay_val = loops_per_jiffy;
-#endif
-}
--- a/arch/sparc/kernel/setup_32.c
+++ b/arch/sparc/kernel/setup_32.c
@@ -422,3 +422,10 @@ static int __init topology_init(void)
}
subsys_initcall(topology_init);
+
+#if defined(CONFIG_SPARC32) && !defined(CONFIG_SMP)
+void __init arch_cpu_finalize_init(void)
+{
+ cpu_data(0).udelay_val = loops_per_jiffy;
+}
+#endif
Patches currently in stable-queue which might be from tglx@xxxxxxxxxxxxx are
queue-5.4/x86-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.4/arm-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.4/um-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.4/mips-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.4/init-x86-move-mem_encrypt_init-into-arch_cpu_finalize_init.patch
queue-5.4/sh-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.4/init-invoke-arch_cpu_finalize_init-earlier.patch
queue-5.4/x86-xen-fix-secondary-processors-fpu-initialization.patch
queue-5.4/x86-fpu-move-fpu-initialization-into-arch_cpu_finalize_init.patch
queue-5.4/init-remove-check_bugs-leftovers.patch
queue-5.4/init-provide-arch_cpu_finalize_init.patch
queue-5.4/m68k-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.4/sparc-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.4/x86-fpu-mark-init-functions-__init.patch
queue-5.4/ia64-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.4/x86-fpu-remove-cpuinfo-argument-from-init-functions.patch
