Commit 97344665 authored by Thomas Gleixner's avatar Thomas Gleixner Committed by sanglipeng
Browse files

m68k/cpu: Switch to arch_cpu_finalize_init() 

stable inclusion
from stable-v5.10.189
commit 1cd3fc18eb169e2f81a34eeaf8147f9395ee8a11
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I8LICQ

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=1cd3fc18eb169e2f81a34eeaf8147f9395ee8a11



--------------------------------

commit 9ceecc25 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: default avatarThomas Gleixner <tglx@linutronix.de>
Acked-by: default avatarGeert Uytterhoeven <geert@linux-m68k.org>
Link: https://lore.kernel.org/r/20230613224545.254342916@linutronix.de


Signed-off-by: default avatarDaniel Sneddon <daniel.sneddon@linux.intel.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng <sanglipeng1@jd.com>
parent b614fce3

arch/m68k/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -4,6 +4,7 @@ config M68K 
	default y

	select ARCH_32BIT_OFF_T

	select ARCH_HAS_BINFMT_FLAT

	select ARCH_HAS_CPU_FINALIZE_INIT if MMU

	select ARCH_HAS_DMA_PREP_COHERENT if HAS_DMA && MMU && !COLDFIRE

	select ARCH_HAS_SYNC_DMA_FOR_DEVICE if HAS_DMA

	select ARCH_HAVE_NMI_SAFE_CMPXCHG if RMW_INSNS

arch/m68k/include/asm/bugs.h

deleted100644 → 0
+0 −21
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0 */

/*

 *  include/asm-m68k/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);

 */



#ifdef CONFIG_MMU

extern void check_bugs(void);	/* in arch/m68k/kernel/setup.c */

#else

static void check_bugs(void)

{

}

#endif

arch/m68k/kernel/setup_mm.c

+2 −1
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */



#include <linux/kernel.h>

#include <linux/cpu.h>

#include <linux/mm.h>

#include <linux/sched.h>

#include <linux/delay.h>
@@ -523,7 +524,7 @@ static int __init proc_hardware_init(void) 
module_init(proc_hardware_init);

#endif



void check_bugs(void)

void __init arch_cpu_finalize_init(void)

{

#if defined(CONFIG_FPU) && !defined(CONFIG_M68KFPU_EMU)

	if (m68k_fputype == 0) {