This is a note to let you know that I've just added the patch titled
m68k/cpu: Switch to arch_cpu_finalize_init()
to the 5.10-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:
m68k-cpu-switch-to-arch_cpu_finalize_init.patch
and it can be found in the queue-5.10 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 088256a95a2e1451689489ea2afeabb106840ae5 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Wed, 14 Jun 2023 01:39:30 +0200
Subject: m68k/cpu: Switch to arch_cpu_finalize_init()
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 9ceecc2589b9d7cef6b321339ed8de484eac4b20 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>
Acked-by: Geert Uytterhoeven <geert@xxxxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20230613224545.254342916@xxxxxxxxxxxxx
Signed-off-by: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/m68k/Kconfig | 1 +
arch/m68k/include/asm/bugs.h | 21 ---------------------
arch/m68k/kernel/setup_mm.c | 3 ++-
3 files changed, 3 insertions(+), 22 deletions(-)
delete mode 100644 arch/m68k/include/asm/bugs.h
--- a/arch/m68k/Kconfig
+++ b/arch/m68k/Kconfig
@@ -4,6 +4,7 @@ config M68K
default y
select ARCH_32BIT_OFF_T
select ARCH_HAS_BINFMT_FLAT
+ select ARCH_HAS_CPU_FINALIZE_INIT if MMU
select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE
select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA
select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS
--- a/arch/m68k/include/asm/bugs.h
+++ /dev/null
@@ -1,21 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * include/asm-m68k/bugs.h
- *
- * Copyright (C) 1994 Linus Torvalds
- */
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- * void check_bugs(void);
- */
-
-#ifdef CONFIG_MMU
-extern void check_bugs(void); /* in arch/m68k/kernel/setup.c */
-#else
-static void check_bugs(void)
-{
-}
-#endif
--- a/arch/m68k/kernel/setup_mm.c
+++ b/arch/m68k/kernel/setup_mm.c
@@ -10,6 +10,7 @@
*/
#include <linux/kernel.h>
+#include <linux/cpu.h>
#include <linux/mm.h>
#include <linux/sched.h>
#include <linux/delay.h>
@@ -523,7 +524,7 @@ static int __init proc_hardware_init(voi
module_init(proc_hardware_init);
#endif
-void check_bugs(void)
+void __init arch_cpu_finalize_init(void)
{
#if defined(CONFIG_FPU) && !defined(CONFIG_M68KFPU_EMU)
if (m68k_fputype == 0) {
Patches currently in stable-queue which might be from tglx@xxxxxxxxxxxxx are
queue-5.10/x86-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.10/arm-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.10/um-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.10/mips-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.10/init-x86-move-mem_encrypt_init-into-arch_cpu_finalize_init.patch
queue-5.10/sh-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.10/init-invoke-arch_cpu_finalize_init-earlier.patch
queue-5.10/x86-xen-fix-secondary-processors-fpu-initialization.patch
queue-5.10/x86-fpu-move-fpu-initialization-into-arch_cpu_finalize_init.patch
queue-5.10/init-remove-check_bugs-leftovers.patch
queue-5.10/init-provide-arch_cpu_finalize_init.patch
queue-5.10/m68k-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.10/sparc-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.10/x86-fpu-mark-init-functions-__init.patch
queue-5.10/ia64-cpu-switch-to-arch_cpu_finalize_init.patch
queue-5.10/x86-fpu-remove-cpuinfo-argument-from-init-functions.patch
