diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2023-06-14 01:39:36 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2023-08-08 19:49:18 +0200 |
| commit | 504aece3f6bcf88b31a809b3bbbe6b1931f78d18 (patch) | |
| tree | 0fe74ebaa538c54698d1c692bcb2a44405ee3471 | |
| parent | b698b5d11a169b4d41d7afe488ab3c408e39e5bc (diff) | |
| download | linux-stable-504aece3f6bcf88b31a809b3bbbe6b1931f78d18.tar.gz linux-stable-504aece3f6bcf88b31a809b3bbbe6b1931f78d18.tar.bz2 linux-stable-504aece3f6bcf88b31a809b3bbbe6b1931f78d18.zip | |
um/cpu: Switch to arch_cpu_finalize_init()
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@linutronix.de>
Acked-by: Richard Weinberger <richard@nod.at>
Link: https://lore.kernel.org/r/20230613224545.493148694@linutronix.de
Signed-off-by: Daniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | arch/um/Kconfig | 1 | ||||
| -rw-r--r-- | arch/um/include/asm/bugs.h | 7 | ||||
| -rw-r--r-- | arch/um/kernel/um_arch.c | 3 |
3 files changed, 3 insertions, 8 deletions
diff --git a/arch/um/Kconfig b/arch/um/Kconfig index 6b9938919f0b..8f0cb2809939 100644 --- 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 diff --git a/arch/um/include/asm/bugs.h b/arch/um/include/asm/bugs.h deleted file mode 100644 index 4473942a0839..000000000000 --- 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 diff --git a/arch/um/kernel/um_arch.c b/arch/um/kernel/um_arch.c index c23f8857a798..66390c321155 100644 --- a/arch/um/kernel/um_arch.c +++ b/arch/um/kernel/um_arch.c @@ -3,6 +3,7 @@ * Licensed under the GPL */ +#include <linux/cpu.h> #include <linux/delay.h> #include <linux/init.h> #include <linux/mm.h> @@ -352,7 +353,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(); |