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 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:
um-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 760b926637a95305fe8b066e8943ef688607dc0e Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Wed, 14 Jun 2023 01:39:36 +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
@@ -5,6 +5,7 @@ menu "UML-specific options"
config UML
bool
default y
+ select ARCH_HAS_CPU_FINALIZE_INIT
select ARCH_HAS_KCOV
select ARCH_NO_PREEMPT
select HAVE_ARCH_AUDITSYSCALL
--- 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>
@@ -353,7 +354,7 @@ void __init setup_arch(char **cmdline_p)
setup_hostinfo(host_info, sizeof host_info);
}
-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-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
