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

ARM: cpu: Switch to arch_cpu_finalize_init() 

stable inclusion
from stable-v5.10.189
commit c0fff20d4efa3bdb3ef203a8ae6e703e0c010199
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=c0fff20d4efa3bdb3ef203a8ae6e703e0c010199



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

commit ee31bb05 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>
Link: https://lore.kernel.org/r/20230613224545.078124882@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 8e30cc8a

arch/arm/Kconfig

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

	select ARCH_32BIT_OFF_T

	select ARCH_HAS_BINFMT_FLAT

	select ARCH_HAS_CPU_FINALIZE_INIT if MMU

	select ARCH_HAS_DEBUG_VIRTUAL if MMU

	select ARCH_HAS_DEVMEM_IS_ALLOWED

	select ARCH_HAS_DMA_WRITE_COMBINE if !ARM_DMA_MEM_BUFFERABLE

arch/arm/include/asm/bugs.h

+0 −4
Original line number Diff line number Diff line 
/* SPDX-License-Identifier: GPL-2.0-only */

/*

 *  arch/arm/include/asm/bugs.h

 *

 *  Copyright (C) 1995-2003 Russell King

 */

#ifndef __ASM_BUGS_H
@@ -10,10 +8,8 @@ 
extern void check_writebuffer_bugs(void);



#ifdef CONFIG_MMU

extern void check_bugs(void);

extern void check_other_bugs(void);

#else

#define check_bugs() do { } while (0)

#define check_other_bugs() do { } while (0)

#endif

arch/arm/kernel/bugs.c

+2 −1
Original line number Diff line number Diff line 
// SPDX-License-Identifier: GPL-2.0

#include <linux/init.h>

#include <linux/cpu.h>

#include <asm/bugs.h>

#include <asm/proc-fns.h>
@@ -11,7 +12,7 @@ void check_other_bugs(void) 
#endif

}



void __init check_bugs(void)

void __init arch_cpu_finalize_init(void)

{

	check_writebuffer_bugs();

	check_other_bugs();