This is a note to let you know that I've just added the patch titled
init: Remove check_bugs() leftovers
to the 6.1-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:
init-remove-check_bugs-leftovers.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From efa70eb13025d49abbeb960312b21a142a2005c3 Mon Sep 17 00:00:00 2001
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Date: Tue, 1 Aug 2023 16:36:25 +0200
Subject: init: Remove check_bugs() leftovers
From: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
commit 61235b24b9cb37c13fcad5b9596d59a1afdcec30 upstream
Everything is converted over to arch_cpu_finalize_init(). Remove the
check_bugs() leftovers including the empty stubs in asm-generic, alpha,
parisc, powerpc and xtensa.
Signed-off-by: Thomas Gleixner <tglx@xxxxxxxxxxxxx>
Reviewed-by: Richard Henderson <richard.henderson@xxxxxxxxxx>
Link: https://lore.kernel.org/r/20230613224545.553215951@xxxxxxxxxxxxx
Signed-off-by: Daniel Sneddon <daniel.sneddon@xxxxxxxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
arch/alpha/include/asm/bugs.h | 20 --------------------
arch/parisc/include/asm/bugs.h | 20 --------------------
arch/powerpc/include/asm/bugs.h | 15 ---------------
arch/xtensa/include/asm/bugs.h | 18 ------------------
include/asm-generic/bugs.h | 11 -----------
init/main.c | 5 -----
6 files changed, 89 deletions(-)
delete mode 100644 arch/alpha/include/asm/bugs.h
delete mode 100644 arch/parisc/include/asm/bugs.h
delete mode 100644 arch/powerpc/include/asm/bugs.h
delete mode 100644 arch/xtensa/include/asm/bugs.h
delete mode 100644 include/asm-generic/bugs.h
--- a/arch/alpha/include/asm/bugs.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/*
- * include/asm-alpha/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);
- */
-
-/*
- * I don't know of any alpha bugs yet.. Nice chip
- */
-
-static void check_bugs(void)
-{
-}
--- a/arch/parisc/include/asm/bugs.h
+++ /dev/null
@@ -1,20 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-/*
- * include/asm-parisc/bugs.h
- *
- * Copyright (C) 1999 Mike Shaver
- */
-
-/*
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Needs:
- * void check_bugs(void);
- */
-
-#include <asm/processor.h>
-
-static inline void check_bugs(void)
-{
-// identify_cpu(&boot_cpu_data);
-}
--- a/arch/powerpc/include/asm/bugs.h
+++ /dev/null
@@ -1,15 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0-or-later */
-#ifndef _ASM_POWERPC_BUGS_H
-#define _ASM_POWERPC_BUGS_H
-
-/*
- */
-
-/*
- * This file is included by 'init/main.c' to check for
- * architecture-dependent bugs.
- */
-
-static inline void check_bugs(void) { }
-
-#endif /* _ASM_POWERPC_BUGS_H */
--- a/arch/xtensa/include/asm/bugs.h
+++ /dev/null
@@ -1,18 +0,0 @@
-/*
- * include/asm-xtensa/bugs.h
- *
- * This is included by init/main.c to check for architecture-dependent bugs.
- *
- * Xtensa processors don't have any bugs. :)
- *
- * This file is subject to the terms and conditions of the GNU General
- * Public License. See the file "COPYING" in the main directory of
- * this archive for more details.
- */
-
-#ifndef _XTENSA_BUGS_H
-#define _XTENSA_BUGS_H
-
-static void check_bugs(void) { }
-
-#endif /* _XTENSA_BUGS_H */
--- a/include/asm-generic/bugs.h
+++ /dev/null
@@ -1,11 +0,0 @@
-/* SPDX-License-Identifier: GPL-2.0 */
-#ifndef __ASM_GENERIC_BUGS_H
-#define __ASM_GENERIC_BUGS_H
-/*
- * This file is included by 'init/main.c' to check for
- * architecture-dependent bugs.
- */
-
-static inline void check_bugs(void) { }
-
-#endif /* __ASM_GENERIC_BUGS_H */
--- a/init/main.c
+++ b/init/main.c
@@ -104,7 +104,6 @@
#include <net/net_namespace.h>
#include <asm/io.h>
-#include <asm/bugs.h>
#include <asm/setup.h>
#include <asm/sections.h>
#include <asm/cacheflush.h>
@@ -1137,10 +1136,6 @@ asmlinkage __visible void __init __no_sa
poking_init();
arch_cpu_finalize_init();
- /* Temporary conditional until everything has been converted */
-#ifndef CONFIG_ARCH_HAS_CPU_FINALIZE_INIT
- check_bugs();
-#endif
acpi_subsystem_init();
arch_post_acpi_subsys_init();
Patches currently in stable-queue which might be from tglx@xxxxxxxxxxxxx are
queue-6.1/x86-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/arm-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/um-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/mips-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/x86-mem_encrypt-unbreak-the-amd_mem_encrypt-n-build.patch
queue-6.1/init-x86-move-mem_encrypt_init-into-arch_cpu_finalize_init.patch
queue-6.1/sh-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/init-invoke-arch_cpu_finalize_init-earlier.patch
queue-6.1/x86-xen-fix-secondary-processors-fpu-initialization.patch
queue-6.1/x86-fpu-move-fpu-initialization-into-arch_cpu_finalize_init.patch
queue-6.1/loongarch-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/init-remove-check_bugs-leftovers.patch
queue-6.1/init-provide-arch_cpu_finalize_init.patch
queue-6.1/m68k-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/x86-init-initialize-signal-frame-size-late.patch
queue-6.1/sparc-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/x86-fpu-mark-init-functions-__init.patch
queue-6.1/ia64-cpu-switch-to-arch_cpu_finalize_init.patch
queue-6.1/x86-fpu-remove-cpuinfo-argument-from-init-functions.patch
