This is a note to let you know that I've just added the patch titled um/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: um-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 712de00666271bfcc9f89a5db0b753ecef331117 Mon Sep 17 00:00:00 2001 From: Thomas Gleixner <tglx@xxxxxxxxxxxxx> Date: Tue, 1 Aug 2023 16:07:11 +0200 Subject: um/cpu: Switch to arch_cpu_finalize_init() From: Thomas Gleixner <tglx@xxxxxxxxxxxxx> commit 9349b5cd0908f8afe95529fc7a8cbb1417df9b0c 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: Richard Weinberger <richard@xxxxxx> Link: https://lore.kernel.org/r/20230613224545.493148694@xxxxxxxxxxxxx Signed-off-by: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx> Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx> --- arch/um/Kconfig | 1 + arch/um/include/asm/bugs.h | 7 ------- arch/um/kernel/um_arch.c | 3 ++- 3 files changed, 3 insertions(+), 8 deletions(-) delete mode 100644 arch/um/include/asm/bugs.h --- a/arch/um/Kconfig +++ b/arch/um/Kconfig @@ -6,6 +6,7 @@ config UML bool default y select ARCH_EPHEMERAL_INODES + select ARCH_HAS_CPU_FINALIZE_INIT select ARCH_HAS_FORTIFY_SOURCE select ARCH_HAS_GCOV_PROFILE_ALL select ARCH_HAS_KCOV --- a/arch/um/include/asm/bugs.h +++ /dev/null @@ -1,7 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0 */ -#ifndef __UM_BUGS_H -#define __UM_BUGS_H - -void check_bugs(void); - -#endif --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -3,6 +3,7 @@ * Copyright (C) 2000 - 2007 Jeff Dike (jdike@{addtoit,linux.intel}.com) */ +#include <linux/cpu.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/mm.h> @@ -430,7 +431,7 @@ void __init setup_arch(char **cmdline_p) } } -void __init check_bugs(void) +void __init arch_cpu_finalize_init(void) { arch_check_bugs(); os_check_bugs(); 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