This is a note to let you know that I've just added the patch titled loongarch/cpu: Switch to arch_cpu_finalize_init() to the 6.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: loongarch-cpu-switch-to-arch_cpu_finalize_init.patch and it can be found in the queue-6.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 7d5118648e6aced4e497409be3115f9df88f2069 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Date: Tue, 1 Aug 2023 16:07:01 +0200 Subject: loongarch/cpu: Switch to arch_cpu_finalize_init() From: Thomas Gleixner <tglx@xxxxxxxxxxxxx> commit 9841c423164787feb8f1442f922b7d80a70c82f1 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> Link: https://lore.kernel.org/r/20230613224545.195288218@xxxxxxxxxxxxx Signed-off-by: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/loongarch/Kconfig | 1 + arch/loongarch/include/asm/bugs.h | 15 --------------- arch/loongarch/kernel/setup.c | 4 ++-- 3 files changed, 3 insertions(+), 17 deletions(-) delete mode 100644 arch/loongarch/include/asm/bugs.h --- a/arch/loongarch/Kconfig +++ b/arch/loongarch/Kconfig @@ -10,6 +10,7 @@ config LOONGARCH select ARCH_ENABLE_MEMORY_HOTPLUG select ARCH_ENABLE_MEMORY_HOTREMOVE select ARCH_HAS_ACPI_TABLE_UPGRADE if ACPI + select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_NMI_SAFE_THIS_CPU_OPS select ARCH_HAS_NON_OVERLAPPING_ADDRESS_SPACE --- a/arch/loongarch/include/asm/bugs.h +++ /dev/null @@ -1,15 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -/* - * This is included by init/main.c to check for architecture-dependent bugs. - * - * Copyright (C) 2020-2022 Loongson Technology Corporation Limited - */ -#ifndef _ASM_BUGS_H -#define _ASM_BUGS_H - -#include <asm/cpu.h> -#include <asm/cpu-info.h> - -extern void check_bugs(void); - -#endif /* _ASM_BUGS_H */ --- a/arch/loongarch/kernel/setup.c +++ b/arch/loongarch/kernel/setup.c @@ -12,6 +12,7 @@ */ #include <linux/init.h> #include <linux/acpi.h> +#include <linux/cpu.h> #include <linux/dmi.h> #include <linux/efi.h> #include <linux/export.h> @@ -37,7 +38,6 @@ #include <asm/addrspace.h> #include <asm/alternative.h> #include <asm/bootinfo.h> -#include <asm/bugs.h> #include <asm/cache.h> #include <asm/cpu.h> #include <asm/dma.h> @@ -87,7 +87,7 @@ const char *get_system_type(void) return "generic-loongson-machine"; } -void __init check_bugs(void) +void __init arch_cpu_finalize_init(void) { alternative_instructions(); } Patches currently in stable-queue which might be from tglx@xxxxxxxxxxxxx are queue-6.4/x86-cpu-switch-to-arch_cpu_finalize_init.patch queue-6.4/arm-cpu-switch-to-arch_cpu_finalize_init.patch queue-6.4/um-cpu-switch-to-arch_cpu_finalize_init.patch queue-6.4/mips-cpu-switch-to-arch_cpu_finalize_init.patch queue-6.4/x86-mem_encrypt-unbreak-the-amd_mem_encrypt-n-build.patch queue-6.4/init-x86-move-mem_encrypt_init-into-arch_cpu_finalize_init.patch queue-6.4/sh-cpu-switch-to-arch_cpu_finalize_init.patch queue-6.4/init-invoke-arch_cpu_finalize_init-earlier.patch queue-6.4/x86-xen-fix-secondary-processors-fpu-initialization.patch queue-6.4/x86-fpu-move-fpu-initialization-into-arch_cpu_finalize_init.patch queue-6.4/loongarch-cpu-switch-to-arch_cpu_finalize_init.patch queue-6.4/init-remove-check_bugs-leftovers.patch queue-6.4/init-provide-arch_cpu_finalize_init.patch queue-6.4/m68k-cpu-switch-to-arch_cpu_finalize_init.patch queue-6.4/x86-init-initialize-signal-frame-size-late.patch queue-6.4/sparc-cpu-switch-to-arch_cpu_finalize_init.patch queue-6.4/x86-fpu-mark-init-functions-__init.patch queue-6.4/ia64-cpu-switch-to-arch_cpu_finalize_init.patch queue-6.4/x86-fpu-remove-cpuinfo-argument-from-init-functions.patch